444 -> ${NOBINMODE}

/usr/share -> ${SHAREDIR}
/usr/games -> ${BINDIR}

10 files changed, 19 insertions, 18 deletions

diff --git a/games/atc/Makefile b/games/atc/Makefile
index 933975a..64f388c 100644
--- a/games/atc/Makefile
+++ b/games/atc/Makefile
@@ -13,6 +13,6 @@ HIDEGAME=hidegame
 
 beforeinstall:
 	(cd ${.CURDIR}/games; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 400 \
-	    ${GAMES} ${DESTDIR}/usr/share/games/atc)
+	    ${GAMES} ${DESTDIR}${SHAREDIR}/games/atc)
 
 .include <bsd.prog.mk>
diff --git a/games/caesar/Makefile b/games/caesar/Makefile
index b9e4bca..2621275 100644
--- a/games/caesar/Makefile
+++ b/games/caesar/Makefile
@@ -10,6 +10,6 @@ CFLAGS+= -Wall
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/rot13.sh ${DESTDIR}/usr/games/rot13
+	    ${.CURDIR}/rot13.sh ${DESTDIR}${BINDIR}/rot13
 
 .include <bsd.prog.mk>
diff --git a/games/cribbage/Makefile b/games/cribbage/Makefile
index 5d93bf6..38e8ec4 100644
--- a/games/cribbage/Makefile
+++ b/games/cribbage/Makefile
@@ -8,7 +8,7 @@ MAN6=	cribbage.6
 HIDEGAME=hidegame
 
 beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/cribbage.n \
-	    ${DESTDIR}/usr/share/games/cribbage.instr
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+	  ${.CURDIR}/cribbage.n  ${DESTDIR}${SHAREDIR}/games/cribbage.instr
 
 .include <bsd.prog.mk>
diff --git a/games/fish/Makefile b/games/fish/Makefile
index fa2e419..4ca0add 100644
--- a/games/fish/Makefile
+++ b/games/fish/Makefile
@@ -5,7 +5,7 @@ MAN6=	fish.6
 HIDEGAME=hidegame
 
 beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/fish.instr \
-	    ${DESTDIR}/usr/share/games/fish.instr
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+	  ${.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 aba0e86..e0b1478 100644
--- a/games/fortune/datfiles/Makefile
+++ b/games/fortune/datfiles/Makefile
@@ -36,10 +36,10 @@ CLEANFILES+=${BLDS}
 all: ${FILES} ${BLDS}
 
 install:
-	(cd ${.CURDIR} && ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${FILES} ${DESTDIR}/usr/share/games/fortune)
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${BLDS} \
-	    ${DESTDIR}/usr/share/games/fortune
+	(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
 
 fortunes.dat fortunes2.dat fortunes2-o.dat limerick.dat startrek.dat zippy.dat:
 	${STRFILE} -rs ${.CURDIR}/${.TARGET:R} ${.TARGET}
diff --git a/games/hack/Makefile b/games/hack/Makefile
index 7187d78..abcb487 100644
--- a/games/hack/Makefile
+++ b/games/hack/Makefile
@@ -35,8 +35,9 @@ beforeinstall:
 	    ${DESTDIR}/var/games/hackdir/record
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 666 ${.CURDIR}/rumors \
 	    ${DESTDIR}/var/games/hackdir/rumors
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/help \
-	    ${.CURDIR}/hh ${.CURDIR}/data ${DESTDIR}/var/games/hackdir
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+		${.CURDIR}/help  ${.CURDIR}/hh ${.CURDIR}/data \
+		${DESTDIR}/var/games/hackdir
 	rm -f ${DESTDIR}/var/games/hackdir/bones*
 
 .include <bsd.prog.mk>
diff --git a/games/larn/Makefile b/games/larn/Makefile
index 4aab5e7..12280cd 100644
--- a/games/larn/Makefile
+++ b/games/larn/Makefile
@@ -63,7 +63,7 @@ HIDEGAME=hidegame
 
 beforeinstall:
 	(cd ${.CURDIR}/datfiles; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \
-	    -m 444 larnmaze larnopts larn.help \
-	    ${DESTDIR}/usr/share/games/larn)
+	    -m ${NOBINMODE} larnmaze larnopts larn.help \
+	    ${DESTDIR}${SHAREDIR}/games/larn)
 
 .include <bsd.prog.mk>
diff --git a/games/quiz/Makefile b/games/quiz/Makefile
index fabca7f..53cab32 100644
--- a/games/quiz/Makefile
+++ b/games/quiz/Makefile
@@ -11,6 +11,6 @@ HIDEGAME=hidegame
 
 beforeinstall:
 	(cd ${.CURDIR}/datfiles; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \
-	    -m 444 ${CATS} ${DESTDIR}/usr/share/games/quiz.db)
+	    -m ${NOBINMODE} ${CATS} ${DESTDIR}${SHAREDIR}/games/quiz.db)
 
 .include <bsd.prog.mk>
diff --git a/games/wargames/Makefile b/games/wargames/Makefile
index 56713f2..b240786 100644
--- a/games/wargames/Makefile
+++ b/games/wargames/Makefile
@@ -5,6 +5,6 @@ all wargames clean cleandir depend lint tags:
 
 install:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} wargames.sh \
-	    ${DESTDIR}/usr/games/wargames
+	    ${DESTDIR}${BINDIR}/wargames
 
 .include <bsd.prog.mk>
diff --git a/games/wump/Makefile b/games/wump/Makefile
index a4ccedc..dddd4c3 100644
--- a/games/wump/Makefile
+++ b/games/wump/Makefile
@@ -5,7 +5,7 @@ MAN6=	wump.6
 HIDEGAME=hidegame
 
 beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/wump.info \
-	    ${DESTDIR}/usr/share/games
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+		${.CURDIR}/wump.info ${DESTDIR}${SHAREDIR}/games
 
 .include <bsd.prog.mk>