Final step of eliminating the "games" distribution: Merge src/games

(or what's left of it, at least) into src/usr.bin.

This change will not be MFCed.

Discussed at:   EuroBSDCon 2014
Committed from: EuroBSDCon 2015

82 files changed, 13 insertions, 41 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index 24f466c..389950c 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -61,9 +61,6 @@ SUBDIR=	${SUBDIR_OVERRIDE}
 .else
 SUBDIR=	lib libexec
 SUBDIR+=bin
-.if ${MK_GAMES} != "no"
-SUBDIR+=games
-.endif
 .if ${MK_CDDL} != "no"
 SUBDIR+=cddl
 .endif
@@ -1285,7 +1282,7 @@ legacy:
 _bt=		_bootstrap-tools
 
 .if ${MK_GAMES} != "no"
-_strfile=	games/fortune/strfile
+_strfile=	usr.bin/fortune/strfile
 .endif
 
 .if ${MK_GCC} != "no" && ${MK_CXX} != "no"
diff --git a/games/Makefile b/games/Makefile
deleted file mode 100644
index 4a3da52..0000000
--- a/games/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-SUBDIR= \
-	caesar \
-	factor \
-	fortune \
-	grdc \
-	morse \
-	number \
-	pom \
-	primes \
-	random \
-	${_tests}
-
-.if ${MK_TESTS} != "no"
-_tests=	tests
-.endif
-
-.include <bsd.subdir.mk>
diff --git a/games/Makefile.inc b/games/Makefile.inc
deleted file mode 100644
index 40525f8..0000000
--- a/games/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
-
-BINDIR?=	/usr/bin
-FILESDIR?=	${SHAREDIR}/games
-WARNS?=		6
diff --git a/games/tests/Makefile b/games/tests/Makefile
deleted file mode 100644
index 45f93d9..0000000
--- a/games/tests/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/games
-
-.PATH:		${.CURDIR:H:H}/tests
-KYUAFILE=	yes
-
-.include <bsd.test.mk>
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index faabe67..4f8a36b 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -230,6 +230,18 @@ SUBDIR+=	finger
 SUBDIR+=	ftp
 .endif
 
+.if ${MK_GAMES} != "no"
+SUBDIR+=	caesar
+SUBDIR+=	factor
+SUBDIR+=	fortune
+SUBDIR+=	grdc
+SUBDIR+=	morse
+SUBDIR+=	number
+SUBDIR+=	pom
+SUBDIR+=	primes
+SUBDIR+=	random
+.endif
+
 .if ${MK_GPL_DTC} != "yes"
 SUBDIR+=	dtc
 .endif
diff --git a/games/caesar/Makefile b/usr.bin/caesar/Makefile
index 88b79ee..88b79ee 100644
--- a/games/caesar/Makefile
+++ b/usr.bin/caesar/Makefile
diff --git a/games/caesar/Makefile.depend b/usr.bin/caesar/Makefile.depend
index c9f9d52..c9f9d52 100644
--- a/games/caesar/Makefile.depend
+++ b/usr.bin/caesar/Makefile.depend
diff --git a/games/caesar/caesar.6 b/usr.bin/caesar/caesar.6
index 91e9af8..91e9af8 100644
--- a/games/caesar/caesar.6
+++ b/usr.bin/caesar/caesar.6
diff --git a/games/caesar/caesar.c b/usr.bin/caesar/caesar.c
index b1f9920..b1f9920 100644
--- a/games/caesar/caesar.c
+++ b/usr.bin/caesar/caesar.c
diff --git a/games/caesar/rot13.sh b/usr.bin/caesar/rot13.sh
index 7dcef74..7dcef74 100644
--- a/games/caesar/rot13.sh
+++ b/usr.bin/caesar/rot13.sh
diff --git a/games/factor/Makefile b/usr.bin/factor/Makefile
index afc9510..afc9510 100644
--- a/games/factor/Makefile
+++ b/usr.bin/factor/Makefile
diff --git a/games/factor/Makefile.depend b/usr.bin/factor/Makefile.depend
index fc0b633..fc0b633 100644
--- a/games/factor/Makefile.depend
+++ b/usr.bin/factor/Makefile.depend
diff --git a/games/factor/factor.6 b/usr.bin/factor/factor.6
index ba82f14..ba82f14 100644
--- a/games/factor/factor.6
+++ b/usr.bin/factor/factor.6
diff --git a/games/factor/factor.c b/usr.bin/factor/factor.c
index 19fe830..19fe830 100644
--- a/games/factor/factor.c
+++ b/usr.bin/factor/factor.c
diff --git a/games/fortune/Makefile b/usr.bin/fortune/Makefile
index b8b4ff1..b8b4ff1 100644
--- a/games/fortune/Makefile
+++ b/usr.bin/fortune/Makefile
diff --git a/games/fortune/Makefile.inc b/usr.bin/fortune/Makefile.inc
index 63751fb..63751fb 100644
--- a/games/fortune/Makefile.inc
+++ b/usr.bin/fortune/Makefile.inc
diff --git a/games/fortune/Notes b/usr.bin/fortune/Notes
index f049391..f049391 100644
--- a/games/fortune/Notes
+++ b/usr.bin/fortune/Notes
diff --git a/games/fortune/README b/usr.bin/fortune/README
index 31b96a2..31b96a2 100644
--- a/games/fortune/README
+++ b/usr.bin/fortune/README
diff --git a/games/fortune/datfiles/Makefile b/usr.bin/fortune/datfiles/Makefile
index 1eabaa4..1eabaa4 100644
--- a/games/fortune/datfiles/Makefile
+++ b/usr.bin/fortune/datfiles/Makefile
diff --git a/games/fortune/datfiles/Makefile.depend b/usr.bin/fortune/datfiles/Makefile.depend
index f80275d..f80275d 100644
--- a/games/fortune/datfiles/Makefile.depend
+++ b/usr.bin/fortune/datfiles/Makefile.depend
diff --git a/games/fortune/datfiles/fortunes b/usr.bin/fortune/datfiles/fortunes
index 1aa54b5..1aa54b5 100644
--- a/games/fortune/datfiles/fortunes
+++ b/usr.bin/fortune/datfiles/fortunes
diff --git a/games/fortune/datfiles/fortunes.sp.ok b/usr.bin/fortune/datfiles/fortunes.sp.ok
index 02229cd..02229cd 100644
--- a/games/fortune/datfiles/fortunes.sp.ok
+++ b/usr.bin/fortune/datfiles/fortunes.sp.ok
diff --git a/games/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips
index 9767586..9767586 100644
--- a/games/fortune/datfiles/freebsd-tips
+++ b/usr.bin/fortune/datfiles/freebsd-tips
diff --git a/games/fortune/datfiles/freebsd-tips.sp.ok b/usr.bin/fortune/datfiles/freebsd-tips.sp.ok
index 968f318..968f318 100644
--- a/games/fortune/datfiles/freebsd-tips.sp.ok
+++ b/usr.bin/fortune/datfiles/freebsd-tips.sp.ok
diff --git a/games/fortune/datfiles/gerrold.limerick b/usr.bin/fortune/datfiles/gerrold.limerick
index f0bbce6..f0bbce6 100644
--- a/games/fortune/datfiles/gerrold.limerick
+++ b/usr.bin/fortune/datfiles/gerrold.limerick
diff --git a/games/fortune/datfiles/limerick b/usr.bin/fortune/datfiles/limerick
index 5a92c78..5a92c78 100644
--- a/games/fortune/datfiles/limerick
+++ b/usr.bin/fortune/datfiles/limerick
diff --git a/games/fortune/datfiles/limerick.sp.ok b/usr.bin/fortune/datfiles/limerick.sp.ok
index be7135d..be7135d 100644
--- a/games/fortune/datfiles/limerick.sp.ok
+++ b/usr.bin/fortune/datfiles/limerick.sp.ok
diff --git a/games/fortune/datfiles/murphy b/usr.bin/fortune/datfiles/murphy
index 949d944..949d944 100644
--- a/games/fortune/datfiles/murphy
+++ b/usr.bin/fortune/datfiles/murphy
diff --git a/games/fortune/datfiles/murphy-o b/usr.bin/fortune/datfiles/murphy-o
index 94c9cc2..94c9cc2 100644
--- a/games/fortune/datfiles/murphy-o
+++ b/usr.bin/fortune/datfiles/murphy-o
diff --git a/games/fortune/datfiles/murphy.sp.ok b/usr.bin/fortune/datfiles/murphy.sp.ok
index 0287e6a..0287e6a 100644
--- a/games/fortune/datfiles/murphy.sp.ok
+++ b/usr.bin/fortune/datfiles/murphy.sp.ok
diff --git a/games/fortune/datfiles/startrek b/usr.bin/fortune/datfiles/startrek
index af3f9d4..af3f9d4 100644
--- a/games/fortune/datfiles/startrek
+++ b/usr.bin/fortune/datfiles/startrek
diff --git a/games/fortune/datfiles/startrek.sp.ok b/usr.bin/fortune/datfiles/startrek.sp.ok
index ccca709..ccca709 100644
--- a/games/fortune/datfiles/startrek.sp.ok
+++ b/usr.bin/fortune/datfiles/startrek.sp.ok
diff --git a/games/fortune/datfiles/zippy b/usr.bin/fortune/datfiles/zippy
index 7c43436..7c43436 100644
--- a/games/fortune/datfiles/zippy
+++ b/usr.bin/fortune/datfiles/zippy
diff --git a/games/fortune/datfiles/zippy.sp.ok b/usr.bin/fortune/datfiles/zippy.sp.ok
index b2f3fff..b2f3fff 100644
--- a/games/fortune/datfiles/zippy.sp.ok
+++ b/usr.bin/fortune/datfiles/zippy.sp.ok
diff --git a/games/fortune/fortune/Makefile b/usr.bin/fortune/fortune/Makefile
index c18ead9..c18ead9 100644
--- a/games/fortune/fortune/Makefile
+++ b/usr.bin/fortune/fortune/Makefile
diff --git a/games/fortune/fortune/Makefile.depend b/usr.bin/fortune/fortune/Makefile.depend
index 3646e2e..3646e2e 100644
--- a/games/fortune/fortune/Makefile.depend
+++ b/usr.bin/fortune/fortune/Makefile.depend
diff --git a/games/fortune/fortune/fortune.6 b/usr.bin/fortune/fortune/fortune.6
index d8f6bad..d8f6bad 100644
--- a/games/fortune/fortune/fortune.6
+++ b/usr.bin/fortune/fortune/fortune.6
diff --git a/games/fortune/fortune/fortune.c b/usr.bin/fortune/fortune/fortune.c
index 2fb2be0..2fb2be0 100644
--- a/games/fortune/fortune/fortune.c
+++ b/usr.bin/fortune/fortune/fortune.c
diff --git a/games/fortune/fortune/pathnames.h b/usr.bin/fortune/fortune/pathnames.h
index 149b3e8..149b3e8 100644
--- a/games/fortune/fortune/pathnames.h
+++ b/usr.bin/fortune/fortune/pathnames.h
diff --git a/games/fortune/strfile/Makefile b/usr.bin/fortune/strfile/Makefile
index a43e8ea..a43e8ea 100644
--- a/games/fortune/strfile/Makefile
+++ b/usr.bin/fortune/strfile/Makefile
diff --git a/games/fortune/strfile/Makefile.depend b/usr.bin/fortune/strfile/Makefile.depend
index 3646e2e..3646e2e 100644
--- a/games/fortune/strfile/Makefile.depend
+++ b/usr.bin/fortune/strfile/Makefile.depend
diff --git a/games/fortune/strfile/strfile.8 b/usr.bin/fortune/strfile/strfile.8
index 26de0d7..26de0d7 100644
--- a/games/fortune/strfile/strfile.8
+++ b/usr.bin/fortune/strfile/strfile.8
diff --git a/games/fortune/strfile/strfile.c b/usr.bin/fortune/strfile/strfile.c
index c88d997..c88d997 100644
--- a/games/fortune/strfile/strfile.c
+++ b/usr.bin/fortune/strfile/strfile.c
diff --git a/games/fortune/strfile/strfile.h b/usr.bin/fortune/strfile/strfile.h
index 5d4f875..5d4f875 100644
--- a/games/fortune/strfile/strfile.h
+++ b/usr.bin/fortune/strfile/strfile.h
diff --git a/games/fortune/tools/Do_spell b/usr.bin/fortune/tools/Do_spell
index d997392..d997392 100644
--- a/games/fortune/tools/Do_spell
+++ b/usr.bin/fortune/tools/Do_spell
diff --git a/games/fortune/tools/Do_troff b/usr.bin/fortune/tools/Do_troff
index 52cb282..52cb282 100644
--- a/games/fortune/tools/Do_troff
+++ b/usr.bin/fortune/tools/Do_troff
diff --git a/games/fortune/tools/Troff.mac b/usr.bin/fortune/tools/Troff.mac
index c2b433e..c2b433e 100644
--- a/games/fortune/tools/Troff.mac
+++ b/usr.bin/fortune/tools/Troff.mac
diff --git a/games/fortune/tools/Troff.sed b/usr.bin/fortune/tools/Troff.sed
index 3216681..3216681 100644
--- a/games/fortune/tools/Troff.sed
+++ b/usr.bin/fortune/tools/Troff.sed
diff --git a/games/fortune/tools/do_sort b/usr.bin/fortune/tools/do_sort
index 07e301b..07e301b 100644
--- a/games/fortune/tools/do_sort
+++ b/usr.bin/fortune/tools/do_sort
diff --git a/games/fortune/tools/do_uniq.py b/usr.bin/fortune/tools/do_uniq.py
index bd62676..bd62676 100644
--- a/games/fortune/tools/do_uniq.py
+++ b/usr.bin/fortune/tools/do_uniq.py
diff --git a/games/fortune/unstr/Makefile b/usr.bin/fortune/unstr/Makefile
index e943d97..e943d97 100644
--- a/games/fortune/unstr/Makefile
+++ b/usr.bin/fortune/unstr/Makefile
diff --git a/games/fortune/unstr/Makefile.depend b/usr.bin/fortune/unstr/Makefile.depend
index 3646e2e..3646e2e 100644
--- a/games/fortune/unstr/Makefile.depend
+++ b/usr.bin/fortune/unstr/Makefile.depend
diff --git a/games/fortune/unstr/unstr.c b/usr.bin/fortune/unstr/unstr.c
index f79a0ec..f79a0ec 100644
--- a/games/fortune/unstr/unstr.c
+++ b/usr.bin/fortune/unstr/unstr.c
diff --git a/games/grdc/Makefile b/usr.bin/grdc/Makefile
index 73d395a..73d395a 100644
--- a/games/grdc/Makefile
+++ b/usr.bin/grdc/Makefile
diff --git a/games/grdc/Makefile.depend b/usr.bin/grdc/Makefile.depend
index 59bc828..59bc828 100644
--- a/games/grdc/Makefile.depend
+++ b/usr.bin/grdc/Makefile.depend
diff --git a/games/grdc/grdc.6 b/usr.bin/grdc/grdc.6
index 5226a6b..5226a6b 100644
--- a/games/grdc/grdc.6
+++ b/usr.bin/grdc/grdc.6
diff --git a/games/grdc/grdc.c b/usr.bin/grdc/grdc.c
index 04cc00b..04cc00b 100644
--- a/games/grdc/grdc.c
+++ b/usr.bin/grdc/grdc.c
diff --git a/games/morse/Makefile b/usr.bin/morse/Makefile
index 4435422..4435422 100644
--- a/games/morse/Makefile
+++ b/usr.bin/morse/Makefile
diff --git a/games/morse/Makefile.depend b/usr.bin/morse/Makefile.depend
index 3646e2e..3646e2e 100644
--- a/games/morse/Makefile.depend
+++ b/usr.bin/morse/Makefile.depend
diff --git a/games/morse/morse.6 b/usr.bin/morse/morse.6
index 94645bb..94645bb 100644
--- a/games/morse/morse.6
+++ b/usr.bin/morse/morse.6
diff --git a/games/morse/morse.c b/usr.bin/morse/morse.c
index 03a09a6..03a09a6 100644
--- a/games/morse/morse.c
+++ b/usr.bin/morse/morse.c
diff --git a/games/number/Makefile b/usr.bin/number/Makefile
index 8e75f71..8e75f71 100644
--- a/games/number/Makefile
+++ b/usr.bin/number/Makefile
diff --git a/games/number/Makefile.depend b/usr.bin/number/Makefile.depend
index 3646e2e..3646e2e 100644
--- a/games/number/Makefile.depend
+++ b/usr.bin/number/Makefile.depend
diff --git a/games/number/number.6 b/usr.bin/number/number.6
index a8be9ff..a8be9ff 100644
--- a/games/number/number.6
+++ b/usr.bin/number/number.6
diff --git a/games/number/number.c b/usr.bin/number/number.c
index e8cf181..e8cf181 100644
--- a/games/number/number.c
+++ b/usr.bin/number/number.c
diff --git a/games/pom/Makefile b/usr.bin/pom/Makefile
index 9a74204..9a74204 100644
--- a/games/pom/Makefile
+++ b/usr.bin/pom/Makefile
diff --git a/games/pom/Makefile.depend b/usr.bin/pom/Makefile.depend
index c9f9d52..c9f9d52 100644
--- a/games/pom/Makefile.depend
+++ b/usr.bin/pom/Makefile.depend
diff --git a/games/pom/pom.6 b/usr.bin/pom/pom.6
index a38a920..a38a920 100644
--- a/games/pom/pom.6
+++ b/usr.bin/pom/pom.6
diff --git a/games/pom/pom.c b/usr.bin/pom/pom.c
index 5f18bb3..5f18bb3 100644
--- a/games/pom/pom.c
+++ b/usr.bin/pom/pom.c
diff --git a/games/primes/Makefile b/usr.bin/primes/Makefile
index bfc4147..bfc4147 100644
--- a/games/primes/Makefile
+++ b/usr.bin/primes/Makefile
diff --git a/games/primes/Makefile.depend b/usr.bin/primes/Makefile.depend
index c9f9d52..c9f9d52 100644
--- a/games/primes/Makefile.depend
+++ b/usr.bin/primes/Makefile.depend
diff --git a/games/primes/pattern.c b/usr.bin/primes/pattern.c
index 2b30678..2b30678 100644
--- a/games/primes/pattern.c
+++ b/usr.bin/primes/pattern.c
diff --git a/games/primes/pr_tbl.c b/usr.bin/primes/pr_tbl.c
index 5bb7093..5bb7093 100644
--- a/games/primes/pr_tbl.c
+++ b/usr.bin/primes/pr_tbl.c
diff --git a/games/primes/primes.c b/usr.bin/primes/primes.c
index a1c95c2..a1c95c2 100644
--- a/games/primes/primes.c
+++ b/usr.bin/primes/primes.c
diff --git a/games/primes/primes.h b/usr.bin/primes/primes.h
index 3a18fc7..3a18fc7 100644
--- a/games/primes/primes.h
+++ b/usr.bin/primes/primes.h
diff --git a/games/primes/spsp.c b/usr.bin/primes/spsp.c
index f61acd6..f61acd6 100644
--- a/games/primes/spsp.c
+++ b/usr.bin/primes/spsp.c
diff --git a/games/random/Makefile b/usr.bin/random/Makefile
index 9136c98..9136c98 100644
--- a/games/random/Makefile
+++ b/usr.bin/random/Makefile
diff --git a/games/random/Makefile.depend b/usr.bin/random/Makefile.depend
index 3646e2e..3646e2e 100644
--- a/games/random/Makefile.depend
+++ b/usr.bin/random/Makefile.depend
diff --git a/games/random/random.6 b/usr.bin/random/random.6
index bd38ba6..bd38ba6 100644
--- a/games/random/random.6
+++ b/usr.bin/random/random.6
diff --git a/games/random/random.c b/usr.bin/random/random.c
index 99f9d90..99f9d90 100644
--- a/games/random/random.c
+++ b/usr.bin/random/random.c
diff --git a/games/random/randomize_fd.c b/usr.bin/random/randomize_fd.c
index f66b965..f66b965 100644
--- a/games/random/randomize_fd.c
+++ b/usr.bin/random/randomize_fd.c
diff --git a/games/random/randomize_fd.h b/usr.bin/random/randomize_fd.h
index de3f873..de3f873 100644
--- a/games/random/randomize_fd.h
+++ b/usr.bin/random/randomize_fd.h