82 files changed, 13 insertions, 41 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 24f466cdc9bf..389950cdf046 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 4a3da52136ba..000000000000
--- 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 40525f8d061c..000000000000
--- 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 45f93d9343bb..000000000000
--- 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 faabe6714bce..4f8a36b9cfe2 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 88b79eeb62aa..88b79eeb62aa 100644
--- a/games/caesar/Makefile
+++ b/usr.bin/caesar/Makefile
diff --git a/games/caesar/Makefile.depend b/usr.bin/caesar/Makefile.depend
index c9f9d52f6e26..c9f9d52f6e26 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 91e9af885ccb..91e9af885ccb 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 b1f9920e6a52..b1f9920e6a52 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 7dcef740525a..7dcef740525a 100644
--- a/games/caesar/rot13.sh
+++ b/usr.bin/caesar/rot13.sh
diff --git a/games/factor/Makefile b/usr.bin/factor/Makefile
index afc9510405f2..afc9510405f2 100644
--- a/games/factor/Makefile
+++ b/usr.bin/factor/Makefile
diff --git a/games/factor/Makefile.depend b/usr.bin/factor/Makefile.depend
index fc0b63320671..fc0b63320671 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 ba82f1407237..ba82f1407237 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 19fe830ca59d..19fe830ca59d 100644
--- a/games/factor/factor.c
+++ b/usr.bin/factor/factor.c
diff --git a/games/fortune/Makefile b/usr.bin/fortune/Makefile
index b8b4ff1466f6..b8b4ff1466f6 100644
--- a/games/fortune/Makefile
+++ b/usr.bin/fortune/Makefile
diff --git a/games/fortune/Makefile.inc b/usr.bin/fortune/Makefile.inc
index 63751fb0bf14..63751fb0bf14 100644
--- a/games/fortune/Makefile.inc
+++ b/usr.bin/fortune/Makefile.inc
diff --git a/games/fortune/Notes b/usr.bin/fortune/Notes
index f049391d7d67..f049391d7d67 100644
--- a/games/fortune/Notes
+++ b/usr.bin/fortune/Notes
diff --git a/games/fortune/README b/usr.bin/fortune/README
index 31b96a2535fb..31b96a2535fb 100644
--- a/games/fortune/README
+++ b/usr.bin/fortune/README
diff --git a/games/fortune/datfiles/Makefile b/usr.bin/fortune/datfiles/Makefile
index 1eabaa4cdc61..1eabaa4cdc61 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 f80275d86ab1..f80275d86ab1 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 1aa54b557b15..1aa54b557b15 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 02229cd5a791..02229cd5a791 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 97675860d175..97675860d175 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 968f318400dc..968f318400dc 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 f0bbce637cb2..f0bbce637cb2 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 5a92c786ac7a..5a92c786ac7a 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 be7135d57027..be7135d57027 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 949d944ac49b..949d944ac49b 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 94c9cc22bc4f..94c9cc22bc4f 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 0287e6a3301f..0287e6a3301f 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 af3f9d4ef95e..af3f9d4ef95e 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 ccca7090d602..ccca7090d602 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 7c43436f93cf..7c43436f93cf 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 b2f3fff9a251..b2f3fff9a251 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 c18ead9ef77d..c18ead9ef77d 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 3646e2e2b1af..3646e2e2b1af 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 d8f6bad177d0..d8f6bad177d0 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 2fb2be0e249e..2fb2be0e249e 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 149b3e8d56b4..149b3e8d56b4 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 a43e8ea3e128..a43e8ea3e128 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 3646e2e2b1af..3646e2e2b1af 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 26de0d727d44..26de0d727d44 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 c88d99741d5b..c88d99741d5b 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 5d4f87558411..5d4f87558411 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 d997392e619e..d997392e619e 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 52cb282b8988..52cb282b8988 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 c2b433e1b213..c2b433e1b213 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 321668123ad9..321668123ad9 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 07e301b2cf71..07e301b2cf71 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 bd626761abb6..bd626761abb6 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 e943d976eac6..e943d976eac6 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 3646e2e2b1af..3646e2e2b1af 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 f79a0ecc6ebd..f79a0ecc6ebd 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 73d395ae33df..73d395ae33df 100644
--- a/games/grdc/Makefile
+++ b/usr.bin/grdc/Makefile
diff --git a/games/grdc/Makefile.depend b/usr.bin/grdc/Makefile.depend
index 59bc82802604..59bc82802604 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 5226a6b2a9c7..5226a6b2a9c7 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 04cc00b37d6f..04cc00b37d6f 100644
--- a/games/grdc/grdc.c
+++ b/usr.bin/grdc/grdc.c
diff --git a/games/morse/Makefile b/usr.bin/morse/Makefile
index 443542293777..443542293777 100644
--- a/games/morse/Makefile
+++ b/usr.bin/morse/Makefile
diff --git a/games/morse/Makefile.depend b/usr.bin/morse/Makefile.depend
index 3646e2e2b1af..3646e2e2b1af 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 94645bbf5c7f..94645bbf5c7f 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 03a09a6cb530..03a09a6cb530 100644
--- a/games/morse/morse.c
+++ b/usr.bin/morse/morse.c
diff --git a/games/number/Makefile b/usr.bin/number/Makefile
index 8e75f71a7858..8e75f71a7858 100644
--- a/games/number/Makefile
+++ b/usr.bin/number/Makefile
diff --git a/games/number/Makefile.depend b/usr.bin/number/Makefile.depend
index 3646e2e2b1af..3646e2e2b1af 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 a8be9ff56b36..a8be9ff56b36 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 e8cf181cb57a..e8cf181cb57a 100644
--- a/games/number/number.c
+++ b/usr.bin/number/number.c
diff --git a/games/pom/Makefile b/usr.bin/pom/Makefile
index 9a74204f2564..9a74204f2564 100644
--- a/games/pom/Makefile
+++ b/usr.bin/pom/Makefile
diff --git a/games/pom/Makefile.depend b/usr.bin/pom/Makefile.depend
index c9f9d52f6e26..c9f9d52f6e26 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 a38a92081478..a38a92081478 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 5f18bb3feaac..5f18bb3feaac 100644
--- a/games/pom/pom.c
+++ b/usr.bin/pom/pom.c
diff --git a/games/primes/Makefile b/usr.bin/primes/Makefile
index bfc4147883bf..bfc4147883bf 100644
--- a/games/primes/Makefile
+++ b/usr.bin/primes/Makefile
diff --git a/games/primes/Makefile.depend b/usr.bin/primes/Makefile.depend
index c9f9d52f6e26..c9f9d52f6e26 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 2b30678cf3b5..2b30678cf3b5 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 5bb709330b83..5bb709330b83 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 a1c95c2a8a02..a1c95c2a8a02 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 3a18fc7dd127..3a18fc7dd127 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 f61acd63b117..f61acd63b117 100644
--- a/games/primes/spsp.c
+++ b/usr.bin/primes/spsp.c
diff --git a/games/random/Makefile b/usr.bin/random/Makefile
index 9136c98a9d1e..9136c98a9d1e 100644
--- a/games/random/Makefile
+++ b/usr.bin/random/Makefile
diff --git a/games/random/Makefile.depend b/usr.bin/random/Makefile.depend
index 3646e2e2b1af..3646e2e2b1af 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 bd38ba628ebb..bd38ba628ebb 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 99f9d900f1b8..99f9d900f1b8 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 f66b9654d281..f66b9654d281 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 de3f87325e3f..de3f87325e3f 100644
--- a/games/random/randomize_fd.h
+++ b/usr.bin/random/randomize_fd.h