Games ownership cleanup.

Urged by:	bde

10 files changed, 22 insertions, 23 deletions

diff --git a/games/Makefile.inc b/games/Makefile.inc
index bd1156f..53870cd 100644
--- a/games/Makefile.inc
+++ b/games/Makefile.inc
@@ -1,11 +1,12 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-BINGRP=       ${GAMEGRP}
-BINDIR?=      /usr/games
+BINDIR?=	/usr/games
 
 .if defined(HIDEGAME)
-GBINDIR:=      ${BINDIR}
-BINDIR:=       ${BINDIR}/hide
-BINMODE=       550
+GBINDIR:=	${BINDIR}
+BINDIR:=	${BINDIR}/hide
+GBINGRP:=	${BINGRP}
+BINGRP=		games
+BINMODE=	550
 .endif
diff --git a/games/atc/Makefile b/games/atc/Makefile
index 5f9e7fe..51ba9ee 100644
--- a/games/atc/Makefile
+++ b/games/atc/Makefile
@@ -12,7 +12,7 @@ GAMES=  Game_List Killer crossover default easy game_2
 HIDEGAME=hidegame
 
 beforeinstall:
-	(cd ${.CURDIR}/games; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${GAMES} ${DESTDIR}${SHAREDIR}/games/atc)
+	(cd ${.CURDIR}/games; ${INSTALL} -c -o ${SHAREOWN} -g ${SHAREGRP} \
+	    -m ${SHAREMODE} ${GAMES} ${DESTDIR}${SHAREDIR}/games/atc)
 
 .include <bsd.prog.mk>
diff --git a/games/cribbage/Makefile b/games/cribbage/Makefile
index 23458f7..896e3bf 100644
--- a/games/cribbage/Makefile
+++ b/games/cribbage/Makefile
@@ -9,7 +9,7 @@ MAN=	cribbage.6
 HIDEGAME=hidegame
 
 beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+	${INSTALL} -c -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
 	  ${.CURDIR}/cribbage.n  ${DESTDIR}${SHAREDIR}/games/cribbage.instr
 .if !exists(${DESTDIR}/var/games/criblog)
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
diff --git a/games/fish/Makefile b/games/fish/Makefile
index be24203..90e8187 100644
--- a/games/fish/Makefile
+++ b/games/fish/Makefile
@@ -6,7 +6,7 @@ MAN=	fish.6
 HIDEGAME=hidegame
 
 beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-	  ${.CURDIR}/fish.instr  ${DESTDIR}${SHAREDIR}/games/fish.instr
+	${INSTALL} -c -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
+	  ${.CURDIR}/fish.instr ${DESTDIR}${SHAREDIR}/games/fish.instr
 
 .include <bsd.prog.mk>
diff --git a/games/fortune/datfiles/Makefile b/games/fortune/datfiles/Makefile
index 20a800d..17c8cd5 100644
--- a/games/fortune/datfiles/Makefile
+++ b/games/fortune/datfiles/Makefile
@@ -26,10 +26,10 @@ CLEANFILES+=${BLDS}
 all: ${BLDS}
 
 beforeinstall:
-	(cd ${.CURDIR} && ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \
-	    -m ${NOBINMODE} ${FILES} ${DESTDIR}${SHAREDIR}/games/fortune)
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} ${BLDS} \
-	    ${DESTDIR}${SHAREDIR}/games/fortune
+	(cd ${.CURDIR} && ${INSTALL} -c -o ${SHAREOWN} -g ${SHAREGRP} \
+	    -m ${SHAREMODE} ${FILES} ${DESTDIR}${SHAREDIR}/games/fortune)
+	${INSTALL} ${COPY} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
+	    ${BLDS} ${DESTDIR}${SHAREDIR}/games/fortune
 
 .for f in fortunes fortunes2 fortunes2-o limerick murphy murphy-o startrek zippy
 $f.dat: $f
diff --git a/games/larn/Makefile b/games/larn/Makefile
index c67d3a6..c2c7668 100644
--- a/games/larn/Makefile
+++ b/games/larn/Makefile
@@ -63,8 +63,8 @@ LDADD=	-ltermcap -lcompat
 HIDEGAME=hidegame
 
 beforeinstall:
-	(cd ${.CURDIR}/datfiles; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \
-	    -m ${NOBINMODE} larnmaze larnopts larn.help \
+	(cd ${.CURDIR}/datfiles; ${INSTALL} -c -o ${SHAREOWN} -g ${SHAREGRP} \
+	    -m ${SHAREMODE} larnmaze larnopts larn.help \
 	    ${DESTDIR}${SHAREDIR}/games/larn)
 .if !exists(${DESTDIR}/var/games/larn/lscore12.0)
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \
diff --git a/games/quiz/Makefile b/games/quiz/Makefile
index 45c69b2..7bd4d5c 100644
--- a/games/quiz/Makefile
+++ b/games/quiz/Makefile
@@ -11,7 +11,7 @@ CATS=	africa america areas arith asia babies bard chinese collectives \
 HIDEGAME=hidegame
 
 beforeinstall:
-	(cd ${.CURDIR}/datfiles; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \
-	    -m ${NOBINMODE} ${CATS} ${DESTDIR}${SHAREDIR}/games/quiz.db)
+	(cd ${.CURDIR}/datfiles; ${INSTALL} -c -o ${SHAREOWN} -g ${SHAREGRP} \
+	    -m ${SHAREMODE} ${CATS} ${DESTDIR}${SHAREDIR}/games/quiz.db)
 
 .include <bsd.prog.mk>
diff --git a/games/wump/Makefile b/games/wump/Makefile
index 8cede50..3700c51 100644
--- a/games/wump/Makefile
+++ b/games/wump/Makefile
@@ -6,7 +6,7 @@ MAN=	wump.6
 HIDEGAME=hidegame
 
 beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+	${INSTALL} -c -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
 		${.CURDIR}/wump.info ${DESTDIR}${SHAREDIR}/games
 
 .include <bsd.prog.mk>
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 45fcab0..f912049 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -146,8 +146,6 @@ BINGRP?=	wheel
 BINMODE?=	555
 NOBINMODE?=	444
 
-GAMEGRP?=	games
-
 INCOWN?=	root
 INCGRP?=	wheel
 INCMODE?=	444
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 7717eb8..cc91049 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -106,8 +106,8 @@ realinstall: beforeinstall
 .endif
 .endif
 .if defined(HIDEGAME)
-	(cd ${DESTDIR}/${GBINDIR}; rm -f ${PROG}; ln -s dm ${PROG}; \
-	    chown -h games:bin ${PROG})
+	(cd ${DESTDIR}${GBINDIR}; ln -fs dm ${PROG}; \
+	    chown -h ${BINOWN}:${GBINGRP} ${PROG})
 .endif
 .if defined(LINKS) && !empty(LINKS)
 	@set ${LINKS}; \