svn commit: r288485 - in head: . games usr.bin usr.bin/caesar usr.bin/factor usr.bin/fortune usr.bin/grdc usr.bin/morse usr.bin/number usr.bin/pom usr.bin/primes usr.bin/random

[Colin Percival]

Author: cperciva
Date: Fri Oct  2 10:08:11 2015
New Revision: 288485
URL: https://svnweb.freebsd.org/changeset/base/288485

Log:
  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

Added:
  head/usr.bin/caesar/
     - copied from r288479, head/games/caesar/
  head/usr.bin/factor/
     - copied from r288479, head/games/factor/
  head/usr.bin/fortune/
     - copied from r288479, head/games/fortune/
  head/usr.bin/grdc/
     - copied from r288479, head/games/grdc/
  head/usr.bin/morse/
     - copied from r288479, head/games/morse/
  head/usr.bin/number/
     - copied from r288479, head/games/number/
  head/usr.bin/pom/
     - copied from r288479, head/games/pom/
  head/usr.bin/primes/
     - copied from r288479, head/games/primes/
  head/usr.bin/random/
     - copied from r288479, head/games/random/
Deleted:
  head/games/
Modified:
  head/Makefile.inc1
  head/usr.bin/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Oct  2 09:23:14 2015	(r288484)
+++ head/Makefile.inc1	Fri Oct  2 10:08:11 2015	(r288485)
@@ -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"

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Fri Oct  2 09:23:14 2015	(r288484)
+++ head/usr.bin/Makefile	Fri Oct  2 10:08:11 2015	(r288485)
@@ -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