Install files via FILES.

8 files changed, 19 insertions, 26 deletions

diff --git a/games/Makefile.inc b/games/Makefile.inc
index 0f61348..428e1f0 100644
--- a/games/Makefile.inc
+++ b/games/Makefile.inc
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 BINDIR?=	/usr/games
+FILESDIR?=	${SHAREDIR}/games
 
 .if defined(HIDEGAME)
 ORIGBINDIR:=	${BINDIR}
diff --git a/games/atc/Makefile b/games/atc/Makefile
index 51ba9ee..ee086e4 100644
--- a/games/atc/Makefile
+++ b/games/atc/Makefile
@@ -8,11 +8,10 @@ SRCS=	extern.c grammar.y graphics.c input.c lex.l list.c log.c \
 MAN=	atc.6
 DPADD=	${LIBL} ${LIBM} ${LIBCURSES}
 LDADD=	-ll -lm -lcurses
-GAMES=  Game_List Killer crossover default easy game_2
+FILES=  Game_List Killer crossover default easy game_2
+FILESDIR=	${SHAREDIR}/games/atc
 HIDEGAME=hidegame
 
-beforeinstall:
-	(cd ${.CURDIR}/games; ${INSTALL} -c -o ${SHAREOWN} -g ${SHAREGRP} \
-	    -m ${SHAREMODE} ${GAMES} ${DESTDIR}${SHAREDIR}/games/atc)
+.PATH: ${.CURDIR}/games
 
 .include <bsd.prog.mk>
diff --git a/games/cribbage/Makefile b/games/cribbage/Makefile
index 896e3bf..53448a7 100644
--- a/games/cribbage/Makefile
+++ b/games/cribbage/Makefile
@@ -5,12 +5,12 @@ PROG=	cribbage
 DPADD=	${LIBCURSES} ${LIBCOMPAT}
 LDADD=	-lcurses -lcompat
 SRCS=	extern.c crib.c cards.c instr.c io.c score.c support.c
+FILES=	cribbage.n
+FILESNAME_cribbage.n=	cribbage.instr
 MAN=	cribbage.6
 HIDEGAME=hidegame
 
 beforeinstall:
-	${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 \
 	    ${DESTDIR}/var/games/criblog
diff --git a/games/fish/Makefile b/games/fish/Makefile
index 90e8187..d2b5035 100644
--- a/games/fish/Makefile
+++ b/games/fish/Makefile
@@ -2,11 +2,8 @@
 # $FreeBSD$
 
 PROG=	fish
+FILES=	fish.instr
 MAN=	fish.6
 HIDEGAME=hidegame
 
-beforeinstall:
-	${INSTALL} -c -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
-	  ${.CURDIR}/fish.instr ${DESTDIR}${SHAREDIR}/games/fish.instr
-
 .include <bsd.prog.mk>
diff --git a/games/hack/Makefile b/games/hack/Makefile
index 47ad3bf..ce503af 100644
--- a/games/hack/Makefile
+++ b/games/hack/Makefile
@@ -18,6 +18,10 @@ MAN=	hack.6
 DPADD=	${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-ltermcap -lcompat
 CFLAGS+= -fwritable-strings -I${.CURDIR} -I.
+FILES=	rumors help hh data
+FILESMODE_rumors=	440
+FILESGRP=	${BINGRP}
+FILESDIR=	/var/games/hackdir
 HIDEGAME=hidegame
 CLEANFILES=hack.onames.h makedefs makedefs.o
 
@@ -36,11 +40,6 @@ beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 460 /dev/null \
 	    ${DESTDIR}/var/games/hackdir/record
 .endif
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 440 ${.CURDIR}/rumors \
-	    ${DESTDIR}/var/games/hackdir/rumors
-	${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* \
 #	    ${DESTDIR}/var/games/hackdir/save/*
 
diff --git a/games/larn/Makefile b/games/larn/Makefile
index c2c7668..a15eba6 100644
--- a/games/larn/Makefile
+++ b/games/larn/Makefile
@@ -60,12 +60,13 @@ SRCS=	main.c object.c create.c tok.c display.c global.c data.c io.c \
 	signal.c moreobj.c movem.c regen.c fortune.c savelev.c
 DPADD=	${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-ltermcap -lcompat
+FILES=	larnmaze larnopts larn.help
+FILESDIR=	${SHAREDIR}/games/larn
 HIDEGAME=hidegame
 
+.PATH: ${.CURDIR}/datfiles
+
 beforeinstall:
-	(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 \
 	    ${DESTDIR}/var/games/larn/lscore12.0
diff --git a/games/quiz/Makefile b/games/quiz/Makefile
index 7bd4d5c..b9b03f1 100644
--- a/games/quiz/Makefile
+++ b/games/quiz/Makefile
@@ -4,14 +4,13 @@
 PROG=	quiz
 SRCS=	quiz.c rxp.c
 MAN=	quiz.6
-CATS=	africa america areas arith asia babies bard chinese collectives \
+FILES=	africa america areas arith asia babies bard chinese collectives \
 	ed elements europe flowers greek inca index latin locomotive \
 	midearth morse murders poetry posneg pres province seq-easy seq-hard \
 	sexes sov spell state trek ucc
+FILESDIR=	${SHAREDIR}/games/quiz.db
 HIDEGAME=hidegame
 
-beforeinstall:
-	(cd ${.CURDIR}/datfiles; ${INSTALL} -c -o ${SHAREOWN} -g ${SHAREGRP} \
-	    -m ${SHAREMODE} ${CATS} ${DESTDIR}${SHAREDIR}/games/quiz.db)
+.PATH: ${.CURDIR}/datfiles
 
 .include <bsd.prog.mk>
diff --git a/games/wump/Makefile b/games/wump/Makefile
index 3700c51..8e58633 100644
--- a/games/wump/Makefile
+++ b/games/wump/Makefile
@@ -2,11 +2,8 @@
 # $FreeBSD$
 
 PROG=	wump
+FILES=	wump.info
 MAN=	wump.6
 HIDEGAME=hidegame
 
-beforeinstall:
-	${INSTALL} -c -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
-		${.CURDIR}/wump.info ${DESTDIR}${SHAREDIR}/games
-
 .include <bsd.prog.mk>