diff options
author | cperciva <cperciva@FreeBSD.org> | 2015-02-12 05:35:00 +0000 |
---|---|---|
committer | cperciva <cperciva@FreeBSD.org> | 2015-02-12 05:35:00 +0000 |
commit | adc74e8335e897f6af1c55f35bab17b1812210a8 (patch) | |
tree | d4f92a5d2765c93869a3c13c371836babbf3e901 /Makefile.inc1 | |
parent | f34d9c4728ee0c482b4ebe78db3e58a668e07185 (diff) | |
download | FreeBSD-src-adc74e8335e897f6af1c55f35bab17b1812210a8.zip FreeBSD-src-adc74e8335e897f6af1c55f35bab17b1812210a8.tar.gz |
Step 1 of eliminating the "games" distribution: Move binaries to /usr/bin;
update paths; and include everything in the "base" distribution.
The "games" distribution being optional made sense when there were more
games and we had small disks; but the "games-like" games were moved into
the ports tree a dozen years ago and the remaining "utility-like" games
occupy less than 0.001% of my laptop's small hard drive. Meanwhile every
new user is confronted by the question "do you want games installed" when
they they try to install FreeBSD.
The next steps will be:
2. Removing punch card (bcd, ppt), phase-of-moon (pom), clock (grdc), and
caesar cipher (caesar, rot13) utilities. I intend to keep fortune, factor,
morse, number, primes, and random, since there is evidence that those are
still being used.
3. Merging src/games into src/usr.bin.
This change will not be MFCed.
Reviewed by: jmg
Discussed at: EuroBSDCon
Approved by: gjb (release-affecting changes)
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index dd56ae3..9fefae8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -189,9 +189,8 @@ OBJTREE= ${MAKEOBJDIRPREFIX} OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp -# /usr/games added for fortune which depend on strfile -BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin -XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games +BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin +XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} @@ -807,9 +806,6 @@ ITOOLS+=makewhatis # Non-base distributions produced by the base system EXTRA_DISTRIBUTIONS= doc -.if ${MK_GAMES} != "no" -EXTRA_DISTRIBUTIONS+= games -.endif .if defined(LIB32TMP) && ${MK_LIB32} != "no" EXTRA_DISTRIBUTIONS+= lib32 .endif |