13 files changed, 8 insertions, 22 deletions
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index 07b1424..55d78b9 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1997/02/22 19:54:03 peter Exp $
+#	$Id: Makefile,v 1.7 1998/06/09 04:07:08 imp Exp $
 
 .include "${.CURDIR}/Makefile.inc"
 
@@ -11,7 +11,6 @@ MLINKS=	at.1 batch.1 \
 	at.1 atq.1 \
 	at.1 atrm.1
 
-BINOWN=	root
 BINMODE= 4555
 MANSRC= .
 CLEANFILES += ${MAN1}
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 8b887f8..f19a257 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -5,7 +5,6 @@ SRCS=	chpass.c edit.c field.c pw_copy.c pw_scan.c pw_util.c pw_yp.c \
 	table.c util.c ypxfr_misc.c ${GENSRCS}
 GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c yppasswd_private.h \
 	yppasswd_private_clnt.c yppasswd_private_xdr.c
-BINOWN=	root
 BINMODE=4555
 .PATH:	${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../usr.sbin/vipw \
 	${.CURDIR}/../../libexec/ypxfr \
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 5ca63c6..2e00f0b 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,6 +1,6 @@
 # Makefile for file(1) cmd.
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
-# @(#)$Id: Makefile,v 1.10 1997/03/18 19:37:15 mpp Exp $
+# @(#)$Id: Makefile,v 1.11 1997/04/04 02:42:53 mpp Exp $
 #
 # This software is not subject to any license of the American Telephone
 # and Telegraph Company or of the Regents of the University of California.
@@ -25,8 +25,6 @@
 # Hacked and dismembered for bmake (Geoff Rehmet).
 
 MAGICDIR=	/usr/share/misc
-MAGICOWN=	bin
-MAGICGRP=	bin
 MAGICMODE=	444
 
 CFLAGS+=	-DMAGIC='"$(MAGICDIR)/magic"' -DBUILTIN_ELF
@@ -50,7 +48,7 @@ magic:	$(MAGFILES)
 	cat $(MAGFILES) > $(.TARGET)
 
 beforeinstall:
-	$(INSTALL) $(COPY) -o $(MAGICOWN) -g $(MAGICGRP) -m $(MAGICMODE) \
+	$(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(MAGICMODE) \
 	    magic $(DESTDIR)$(MAGICDIR)/magic
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/keyinfo/Makefile b/usr.bin/keyinfo/Makefile
index 93bfb8a..1fdd57c 100644
--- a/usr.bin/keyinfo/Makefile
+++ b/usr.bin/keyinfo/Makefile
@@ -1,6 +1,5 @@
 #	@(#)Makefile	5.5 (Berkeley) 7/1/90
 
-BINOWN= root
 BINMODE=4555
 
 MAN1=	keyinfo.1
diff --git a/usr.bin/keyinit/Makefile b/usr.bin/keyinit/Makefile
index 0292d37..41de62d 100644
--- a/usr.bin/keyinit/Makefile
+++ b/usr.bin/keyinit/Makefile
@@ -6,7 +6,6 @@ SRCS=	skeyinit.c
 
 CFLAGS+= -D_SKEY_INTERNAL
 
-BINOWN=	root
 BINMODE=4555
 
 DPADD=	${LIBSKEY} ${LIBCRYPT} ${LIBMD}
diff --git a/usr.bin/limits/Makefile b/usr.bin/limits/Makefile
index 885930f..d606593 100644
--- a/usr.bin/limits/Makefile
+++ b/usr.bin/limits/Makefile
@@ -7,7 +7,6 @@ CFLAGS+=-Wall
 LDADD+= -lutil
 DPADD+= ${LIBUTIL}
 
-BINOWN=	root
 BINMODE=0555
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile
index 1a55d41..a4b697a 100644
--- a/usr.bin/lock/Makefile
+++ b/usr.bin/lock/Makefile
@@ -1,7 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	lock
-BINOWN= root
 BINMODE=4555
 DPADD=	${LIBCRYPT}
 LDADD=	-lcrypt
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 4c7615a..71fa73e 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $Id$
+# $Id: Makefile,v 1.20 1998/08/06 21:37:04 markm Exp $
 
 PROG=	login
 MAN1=	login.1
@@ -26,7 +26,6 @@ LDADD+=	-lkrb -ldes
 DISTRIBUTION=	krb
 .endif
 
-BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
 
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 4909e57..cfa98db 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
-# $Id$
+# $Id: Makefile,v 1.29 1998/08/06 21:37:51 markm Exp $
 
 PROG=	passwd
 SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
@@ -49,7 +49,6 @@ yppasswd_private_xdr.c: ${RPCSRC_PRIV}
 yppasswd_private_clnt.c: ${RPCSRC_PRIV}
 	${RPCGEN} -l -o ${.TARGET} ${RPCSRC_PRIV}
 
-BINOWN=	root
 BINMODE=4555
 MAN1=passwd.1
 LINKS=${BINDIR}/passwd ${BINDIR}/yppasswd
diff --git a/usr.bin/quota/Makefile b/usr.bin/quota/Makefile
index de2b4a8..f9093b3 100644
--- a/usr.bin/quota/Makefile
+++ b/usr.bin/quota/Makefile
@@ -1,7 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	quota
-BINOWN=	root
 BINMODE=4555
 
 DPADD=	${LIBRPCSVC}
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 293a34b..7784633 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,11 +1,10 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.10 1998/08/06 21:38:27 markm Exp $
+#	$Id: Makefile,v 1.11 1998/09/05 00:31:38 jb Exp $
 
 PROG=	rlogin
 SRCS=	rlogin.c
 CFLAGS+=-Wall
 
-BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
 
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index 4165d49..264374c 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.6 1998/08/06 21:39:12 markm Exp $
+#	$Id: Makefile,v 1.7 1998/09/05 00:32:27 jb Exp $
 
 PROG=	rsh
 SRCS=	rsh.c
@@ -19,7 +19,6 @@ DISTRIBUTION=	krb
 .PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
 .endif
 
-BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
 
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 798b67d..c698911 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.19 1998/08/30 17:02:51 gpalmer Exp $
+#	$Id: Makefile,v 1.20 1998/09/02 14:46:20 bde Exp $
 
 PROG=	su
 SRCS=	su.c
@@ -28,7 +28,6 @@ LDADD+=	-lkrb -ldes
 DISTRIBUTION=	krb
 .endif
 
-BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg