Date: Wed, 11 Feb 2015 22:17:05 -0800 From: Devin Teske <devin@shxd.cx> To: Colin Percival <cperciva@FreeBSD.org> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, Devin Teske <dteske@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org> Subject: Re: svn commit: r278616 - in head: . contrib/netbsd-tests/games etc etc/mtree etc/root games games/caesar games/fortune/datfiles release/scripts share/man/man4 share/man/man6 share/man/man7 share/mk sh... Message-ID: <B5EB7248-B156-4435-A716-80AE945FE6F5@shxd.cx> In-Reply-To: <201502120535.t1C5Z0el061979@svn.freebsd.org> References: <201502120535.t1C5Z0el061979@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
PLEASE! Do NOT remove the grand digital clock (grdc). So many of us over the years have used it as a terminal keeper-aliver :) (an= d as a clock, to boot). I will be very sad if you remove grdc. --=20 Devin > On Feb 11, 2015, at 9:35 PM, Colin Percival <cperciva@FreeBSD.org> wrote: >=20 > Author: cperciva > Date: Thu Feb 12 05:35:00 2015 > New Revision: 278616 > URL: https://svnweb.freebsd.org/changeset/base/278616 >=20 > Log: > Step 1 of eliminating the "games" distribution: Move binaries to /usr/bin= ; > update paths; and include everything in the "base" distribution. >=20 > 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. >=20 > The next steps will be: >=20 > 2. Removing punch card (bcd, ppt), phase-of-moon (pom), clock (grdc), and= > caesar cipher (caesar, rot13) utilities. I intend to keep fortune, facto= r, > morse, number, primes, and random, since there is evidence that those are= > still being used. >=20 > 3. Merging src/games into src/usr.bin. >=20 > This change will not be MFCed. >=20 > Reviewed by: jmg > Discussed at: EuroBSDCon > Approved by: gjb (release-affecting changes) >=20 > Modified: > head/Makefile.inc1 > head/ObsoleteFiles.inc > head/contrib/netbsd-tests/games/t_factor.sh > head/etc/login.conf > head/etc/master.passwd > head/etc/mtree/BSD.debug.dist > head/etc/mtree/BSD.usr.dist > head/etc/root/dot.cshrc > head/etc/root/dot.login > head/etc/root/dot.profile > head/games/Makefile.inc > head/games/caesar/rot13.sh > head/games/fortune/datfiles/Makefile > head/release/scripts/make-manifest.sh > head/share/man/man4/led.4 > head/share/man/man6/intro.6 > head/share/man/man7/hier.7 > head/share/mk/bsd.prog.mk > head/share/skel/dot.cshrc > head/share/skel/dot.login > head/share/skel/dot.profile > head/tools/build/mk/OptionalObsoleteFiles.inc > head/tools/tools/nanobsd/gateworks/Files/root/.profile > head/tools/tools/nanobsd/pcengines/Files/root/.cshrc > head/tools/tools/nanobsd/pcengines/Files/root/.login > head/tools/tools/nanobsd/rescue/Files/root/.cshrc > head/usr.bin/whereis/pathnames.h > head/usr.bin/whereis/whereis.1 > head/usr.bin/whereis/whereis.c > head/usr.sbin/bsdconfig/include/messages.subr > head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh >=20 > Modified: head/Makefile.inc1 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/Makefile.inc1 Thu Feb 12 04:31:17 2015 (r278615) > +++ head/Makefile.inc1 Thu Feb 12 05:35:00 2015 (r278616) > @@ -189,9 +189,8 @@ OBJTREE=3D ${MAKEOBJDIRPREFIX} > OBJTREE=3D ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} > .endif > WORLDTMP=3D ${OBJTREE}${.CURDIR}/tmp > -# /usr/games added for fortune which depend on strfile > -BPATH=3D ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${= WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin > -XPATH=3D ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/= games > +BPATH=3D ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${= WORLDTMP}/legacy/bin > +XPATH=3D ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin > STRICTTMPPATH=3D ${BPATH}:${XPATH} > TMPPATH=3D ${STRICTTMPPATH}:${PATH} >=20 > @@ -807,9 +806,6 @@ ITOOLS+=3Dmakewhatis >=20 > # Non-base distributions produced by the base system > EXTRA_DISTRIBUTIONS=3D doc > -.if ${MK_GAMES} !=3D "no" > -EXTRA_DISTRIBUTIONS+=3D games > -.endif > .if defined(LIB32TMP) && ${MK_LIB32} !=3D "no" > EXTRA_DISTRIBUTIONS+=3D lib32 > .endif >=20 > Modified: head/ObsoleteFiles.inc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/ObsoleteFiles.inc Thu Feb 12 04:31:17 2015 (r278615) > +++ head/ObsoleteFiles.inc Thu Feb 12 05:35:00 2015 (r278616) > @@ -38,6 +38,22 @@ > # xargs -n1 | sort | uniq -d; > # done >=20 > +# 20150212: /usr/games moving into /usr/bin > +OLD_FILES+=3Dusr/games/bcd > +OLD_FILES+=3Dusr/games/caesar > +OLD_FILES+=3Dusr/games/factor > +OLD_FILES+=3Dusr/games/fortune > +OLD_FILES+=3Dusr/games/grdc > +OLD_FILES+=3Dusr/games/morse > +OLD_FILES+=3Dusr/games/number > +OLD_FILES+=3Dusr/games/pom > +OLD_FILES+=3Dusr/games/ppt > +OLD_FILES+=3Dusr/games/primes > +OLD_FILES+=3Dusr/games/random > +OLD_FILES+=3Dusr/games/rot13 > +OLD_FILES+=3Dusr/games/strfile > +OLD_FILES+=3Dusr/games/unstr > +OLD_DIRS+=3Dusr/games > # 20150209: liblzma header > OLD_FILES+=3Dusr/include/lzma/lzma.h > # 20150124: spl.9 and friends >=20 > Modified: head/contrib/netbsd-tests/games/t_factor.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/contrib/netbsd-tests/games/t_factor.sh Thu Feb 12 04:31:17 201= 5 (r278615) > +++ head/contrib/netbsd-tests/games/t_factor.sh Thu Feb 12 05:35:00 201= 5 (r278616) > @@ -27,13 +27,13 @@ >=20 > expect() { > echo "${2}" >expout > - atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1} > + atf_check -s eq:0 -o file:expout -e empty /usr/bin/factor ${1} > } >=20 > atf_test_case overflow > overflow_head() { > atf_set "descr" "Tests for overflow conditions" > - atf_set "require.progs" "/usr/games/factor" > + atf_set "require.progs" "/usr/bin/factor" > } > overflow_body() { > expect '8675309' '8675309: 8675309' > @@ -44,7 +44,7 @@ atf_test_case loop > loop_head() { > atf_set "descr" "Tests some cases that once locked the program" \ > "in an infinite loop" > - atf_set "require.progs" "/usr/games/factor" > + atf_set "require.progs" "/usr/bin/factor" > } > loop_body() { > expect '99999999999991' '99999999999991: 7 13 769231 1428571' >=20 > Modified: head/etc/login.conf > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/etc/login.conf Thu Feb 12 04:31:17 2015 (r278615) > +++ head/etc/login.conf Thu Feb 12 05:35:00 2015 (r278616) > @@ -27,7 +27,7 @@ default:\ > :copyright=3D/etc/COPYRIGHT:\ > :welcome=3D/etc/motd:\ > :setenv=3DMAIL=3D/var/mail/$,BLOCKSIZE=3DK:\ > - :path=3D/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr= /local/bin ~/bin:\ > + :path=3D/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~= /bin:\ > :nologin=3D/var/run/nologin:\ > :cputime=3Dunlimited:\ > :datasize=3Dunlimited:\ >=20 > Modified: head/etc/master.passwd > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/etc/master.passwd Thu Feb 12 04:31:17 2015 (r278615) > +++ head/etc/master.passwd Thu Feb 12 05:35:00 2015 (r278616) > @@ -7,7 +7,7 @@ operator:*:2:5::0:0:System &:/:/usr/sbin > bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin > tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin > kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin > -games:*:7:13::0:0:Games pseudo-user:/usr/games:/usr/sbin/nologin > +games:*:7:13::0:0:Games pseudo-user:/:/usr/sbin/nologin > news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin > man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin > sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin >=20 > Modified: head/etc/mtree/BSD.debug.dist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/etc/mtree/BSD.debug.dist Thu Feb 12 04:31:17 2015 (r278615)= > +++ head/etc/mtree/BSD.debug.dist Thu Feb 12 05:35:00 2015 (r278616)= > @@ -21,8 +21,6 @@ > usr > bin > .. > - games > - .. > lib > clang > 3.5.1 >=20 > Modified: head/etc/mtree/BSD.usr.dist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/etc/mtree/BSD.usr.dist Thu Feb 12 04:31:17 2015 (r278615) > +++ head/etc/mtree/BSD.usr.dist Thu Feb 12 05:35:00 2015 (r278616) > @@ -7,8 +7,6 @@ > . > bin > .. > - games > - .. > include > .. > lib >=20 > Modified: head/etc/root/dot.cshrc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/etc/root/dot.cshrc Thu Feb 12 04:31:17 2015 (r278615) > +++ head/etc/root/dot.cshrc Thu Feb 12 05:35:00 2015 (r278616) > @@ -15,7 +15,7 @@ alias ll ls -lAF > # A righteous umask > umask 22 >=20 > -set path =3D (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /u= sr/local/bin $HOME/bin) > +set path =3D (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bi= n $HOME/bin) >=20 > setenv EDITOR vi > setenv PAGER more >=20 > Modified: head/etc/root/dot.login > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/etc/root/dot.login Thu Feb 12 04:31:17 2015 (r278615) > +++ head/etc/root/dot.login Thu Feb 12 05:35:00 2015 (r278616) > @@ -6,4 +6,4 @@ > # >=20 > # Uncomment to display a random cookie each login: > -# if ( -x /usr/games/fortune ) /usr/games/fortune -s > +# if ( -x /usr/bin/fortune ) /usr/bin/fortune -s >=20 > Modified: head/etc/root/dot.profile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/etc/root/dot.profile Thu Feb 12 04:31:17 2015 (r278615) > +++ head/etc/root/dot.profile Thu Feb 12 05:35:00 2015 (r278616) > @@ -1,6 +1,6 @@ > # $FreeBSD$ > # > -PATH=3D/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/loca= l/bin:~/bin > +PATH=3D/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin= > export PATH > HOME=3D/root > export HOME >=20 > Modified: head/games/Makefile.inc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/games/Makefile.inc Thu Feb 12 04:31:17 2015 (r278615) > +++ head/games/Makefile.inc Thu Feb 12 05:35:00 2015 (r278616) > @@ -1,7 +1,6 @@ > # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 > # $FreeBSD$ >=20 > -BINDIR?=3D /usr/games > +BINDIR?=3D /usr/bin > FILESDIR?=3D ${SHAREDIR}/games > WARNS?=3D 6 > -DISTRIBUTION?=3D games >=20 > Modified: head/games/caesar/rot13.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/games/caesar/rot13.sh Thu Feb 12 04:31:17 2015 (r278615) > +++ head/games/caesar/rot13.sh Thu Feb 12 05:35:00 2015 (r278616) > @@ -30,4 +30,4 @@ > # @(#)rot13.sh 8.1 (Berkeley) 5/31/93 > # $FreeBSD$ >=20 > -exec /usr/games/caesar 13 "$@" > +exec /usr/bin/caesar 13 "$@" >=20 > Modified: head/games/fortune/datfiles/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/games/fortune/datfiles/Makefile Thu Feb 12 04:31:17 2015 (r= 278615) > +++ head/games/fortune/datfiles/Makefile Thu Feb 12 05:35:00 2015 (r= 278616) > @@ -15,7 +15,7 @@ FILESDIR=3D ${SHAREDIR}/games/fortune >=20 > .for f in ${DB} > $f.dat: $f > - PATH=3D$$PATH:/usr/games:${.OBJDIR}/../strfile \ > + PATH=3D$$PATH:/usr/bin:${.OBJDIR}/../strfile \ > strfile -Cs ${.ALLSRC} ${.TARGET} > .endfor >=20 >=20 > Modified: head/release/scripts/make-manifest.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/release/scripts/make-manifest.sh Thu Feb 12 04:31:17 2015 (= r278615) > +++ head/release/scripts/make-manifest.sh Thu Feb 12 05:35:00 2015 (= r278616) > @@ -13,7 +13,6 @@ desc_base=3D"Base system (MANDATORY)" > desc_kernel=3D"Kernel (MANDATORY)" > desc_doc=3D"Additional documentation" > doc_default=3Doff > -desc_games=3D"Games (fortune, etc.)" > desc_lib32=3D"32-bit compatibility libraries" > desc_ports=3D"Ports tree" > desc_src=3D"System source code" >=20 > Modified: head/share/man/man4/led.4 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/share/man/man4/led.4 Thu Feb 12 04:31:17 2015 (r278615) > +++ head/share/man/man4/led.4 Thu Feb 12 05:35:00 2015 (r278616) > @@ -170,7 +170,7 @@ flashes > .Pp > .Dl *_*__**_ > .Bd -literal > -/usr/games/morse -l "Soekris rocks" > /dev/led/error > +/usr/bin/morse -l "Soekris rocks" > /dev/led/error > .Ed > .Sh SEE ALSO > .Xr morse 6 >=20 > Modified: head/share/man/man6/intro.6 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/share/man/man6/intro.6 Thu Feb 12 04:31:17 2015 (r278615) > +++ head/share/man/man6/intro.6 Thu Feb 12 05:35:00 2015 (r278616) > @@ -37,7 +37,7 @@ > This section contains information about games. > The games > are located in > -.Pa /usr/games > +.Pa /usr/bin > if installed. > You can get a short overview about all the games with the > command: > @@ -45,13 +45,18 @@ command: > $ apropos '\\(6\\)' > .Ed > .Sh FILES > -.Bl -tag -width /usr/games -compact > -.It Pa /usr/games > +.Bl -tag -width /usr/bin -compact > +.It Pa /usr/bin > location of games > .El > .Sh SEE ALSO > .Xr intro 1 > .Sh HISTORY > +In earlier versions of > +.Fx , > +games were located in > +.Pa /usr/games . > +.Pp > The > .Nm > section manual page appeared in >=20 > Modified: head/share/man/man7/hier.7 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/share/man/man7/hier.7 Thu Feb 12 04:31:17 2015 (r278615) > +++ head/share/man/man7/hier.7 Thu Feb 12 05:35:00 2015 (r278616) > @@ -187,8 +187,6 @@ common utilities, programming tools, and > .It Pa compat/ > files needed to support binary compatibility with other operating systems,= > such as Linux > -.It Pa games/ > -useful and semi-frivolous programs > .It Pa include/ > standard C include files > .Pp >=20 > Modified: head/share/mk/bsd.prog.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/share/mk/bsd.prog.mk Thu Feb 12 04:31:17 2015 (r278615) > +++ head/share/mk/bsd.prog.mk Thu Feb 12 05:35:00 2015 (r278616) > @@ -62,7 +62,7 @@ PROG_FULL=3D${PROG}.full > ${BINDIR} =3D=3D "/bin" ||\ > ${BINDIR} =3D=3D "/libexec" ||\ > ${BINDIR} =3D=3D "/sbin" ||\ > - ${BINDIR:C%/usr/(bin|bsdinstall|games|libexec|lpr|sendmail|sm.bin|sbi= n)(/.*)?%/usr/bin%} =3D=3D "/usr/bin"\ > + ${BINDIR:C%/usr/(bin|bsdinstall|libexec|lpr|sendmail|sm.bin|sbin)(/.*= )?%/usr/bin%} =3D=3D "/usr/bin"\ > ) > DEBUGFILEDIR=3D ${DEBUGDIR}${BINDIR} > .else >=20 > Modified: head/share/skel/dot.cshrc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/share/skel/dot.cshrc Thu Feb 12 04:31:17 2015 (r278615) > +++ head/share/skel/dot.cshrc Thu Feb 12 05:35:00 2015 (r278616) > @@ -14,7 +14,7 @@ alias ll ls -lAF >=20 > # These are normally set through /etc/login.conf. You may override them h= ere > # if wanted. > -# set path =3D (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /= usr/local/bin $HOME/bin) > +# set path =3D (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/= bin $HOME/bin) > # setenv BLOCKSIZE K > # A righteous umask > # umask 22 >=20 > Modified: head/share/skel/dot.login > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/share/skel/dot.login Thu Feb 12 04:31:17 2015 (r278615) > +++ head/share/skel/dot.login Thu Feb 12 05:35:00 2015 (r278616) > @@ -5,4 +5,4 @@ > # see also csh(1), environ(7). > # >=20 > -if ( -x /usr/games/fortune ) /usr/games/fortune freebsd-tips > +if ( -x /usr/bin/fortune ) /usr/bin/fortune freebsd-tips >=20 > Modified: head/share/skel/dot.profile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/share/skel/dot.profile Thu Feb 12 04:31:17 2015 (r278615) > +++ head/share/skel/dot.profile Thu Feb 12 05:35:00 2015 (r278616) > @@ -7,7 +7,7 @@ >=20 > # These are normally set through /etc/login.conf. You may override them h= ere > # if wanted. > -# PATH=3D/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/lo= cal/bin:$HOME/bin; export PATH > +# PATH=3D/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:$HO= ME/bin; export PATH > # BLOCKSIZE=3DK; export BLOCKSIZE >=20 > # Setting TERM is normally done through /etc/ttys. Do only override > @@ -21,4 +21,4 @@ PAGER=3Dmore; export PAGER > # set ENV to a file invoked each time sh is started for interactive use. > ENV=3D$HOME/.shrc; export ENV >=20 > -if [ -x /usr/games/fortune ] ; then /usr/games/fortune freebsd-tips ; fi > +if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune freebsd-tips ; fi >=20 > Modified: head/tools/build/mk/OptionalObsoleteFiles.inc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 12 04:31:17 2= 015 (r278615) > +++ head/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 12 05:35:00 2= 015 (r278616) > @@ -1606,21 +1606,20 @@ OLD_FILES+=3Dusr/share/man/man8/freebsd-up > .endif >=20 > .if ${MK_GAMES} =3D=3D no > -OLD_FILES+=3Dusr/games/bcd > -OLD_FILES+=3Dusr/games/caesar > -OLD_FILES+=3Dusr/games/factor > -OLD_FILES+=3Dusr/games/fortune > -OLD_FILES+=3Dusr/games/grdc > -OLD_FILES+=3Dusr/games/morse > -OLD_FILES+=3Dusr/games/number > -OLD_FILES+=3Dusr/games/pom > -OLD_FILES+=3Dusr/games/ppt > -OLD_FILES+=3Dusr/games/primes > -OLD_FILES+=3Dusr/games/random > -OLD_FILES+=3Dusr/games/rot13 > -OLD_FILES+=3Dusr/games/strfile > -OLD_FILES+=3Dusr/games/unstr > -OLD_DIRS+=3Dusr/games > +OLD_FILES+=3Dusr/bin/bcd > +OLD_FILES+=3Dusr/bin/caesar > +OLD_FILES+=3Dusr/bin/factor > +OLD_FILES+=3Dusr/bin/fortune > +OLD_FILES+=3Dusr/bin/grdc > +OLD_FILES+=3Dusr/bin/morse > +OLD_FILES+=3Dusr/bin/number > +OLD_FILES+=3Dusr/bin/pom > +OLD_FILES+=3Dusr/bin/ppt > +OLD_FILES+=3Dusr/bin/primes > +OLD_FILES+=3Dusr/bin/random > +OLD_FILES+=3Dusr/bin/rot13 > +OLD_FILES+=3Dusr/bin/strfile > +OLD_FILES+=3Dusr/bin/unstr > OLD_FILES+=3Dusr/share/games/fortune/fortunes > OLD_FILES+=3Dusr/share/games/fortune/fortunes.dat > OLD_FILES+=3Dusr/share/games/fortune/freebsd-tips >=20 > Modified: head/tools/tools/nanobsd/gateworks/Files/root/.profile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/tools/tools/nanobsd/gateworks/Files/root/.profile Thu Feb 12 0= 4:31:17 2015 (r278615) > +++ head/tools/tools/nanobsd/gateworks/Files/root/.profile Thu Feb 12 0= 5:35:00 2015 (r278616) > @@ -1,6 +1,6 @@ > # $FreeBSD: src/etc/root/dot.profile,v 1.21 2007/05/29 06:33:10 dougb Exp $= > # > -PATH=3D/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/loca= l/bin:~/bin > +PATH=3D/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin= > export PATH > HOME=3D/root; export HOME > TERM=3D${TERM:-xterm}; export TERM >=20 > Modified: head/tools/tools/nanobsd/pcengines/Files/root/.cshrc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/tools/tools/nanobsd/pcengines/Files/root/.cshrc Thu Feb 12 04:= 31:17 2015 (r278615) > +++ head/tools/tools/nanobsd/pcengines/Files/root/.cshrc Thu Feb 12 05:= 35:00 2015 (r278616) > @@ -14,7 +14,7 @@ alias ll ls -lA > # A righteous umask > umask 22 >=20 > -set path =3D (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /u= sr/local/bin $HOME/bin) > +set path =3D (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bi= n $HOME/bin) >=20 > setenv EDITOR vi > setenv PAGER more >=20 > Modified: head/tools/tools/nanobsd/pcengines/Files/root/.login > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/tools/tools/nanobsd/pcengines/Files/root/.login Thu Feb 12 04:= 31:17 2015 (r278615) > +++ head/tools/tools/nanobsd/pcengines/Files/root/.login Thu Feb 12 05:= 35:00 2015 (r278616) > @@ -6,4 +6,4 @@ > # >=20 > # Uncomment to display a random cookie each login: > -# [ -x /usr/games/fortune ] && /usr/games/fortune -s > +# [ -x /usr/bin/fortune ] && /usr/bin/fortune -s >=20 > Modified: head/tools/tools/nanobsd/rescue/Files/root/.cshrc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/tools/tools/nanobsd/rescue/Files/root/.cshrc Thu Feb 12 04:31:= 17 2015 (r278615) > +++ head/tools/tools/nanobsd/rescue/Files/root/.cshrc Thu Feb 12 05:35:= 00 2015 (r278616) > @@ -11,7 +11,7 @@ > a lm 'll | more' > a m more >=20 > -set path =3D (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /u= sr/local/bin /usr/X11R6/bin /usr/local/jdk1.6.0/bin /usr/local/jdk1.5.0/bin $= HOME/bin) > +set path =3D (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bi= n /usr/X11R6/bin /usr/local/jdk1.6.0/bin /usr/local/jdk1.5.0/bin $HOME/bin) > setenv MANPATH "/usr/share/man:/usr/X11R6/man:/usr/local/man" >=20 > setenv PAGER more >=20 > Modified: head/usr.bin/whereis/pathnames.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/usr.bin/whereis/pathnames.h Thu Feb 12 04:31:17 2015 (r2786= 15) > +++ head/usr.bin/whereis/pathnames.h Thu Feb 12 05:35:00 2015 (r2786= 16) > @@ -25,9 +25,8 @@ > * $FreeBSD$ > */ >=20 > -/* Where to look for libexec and games */ > +/* Where to look for libexec */ > #define PATH_LIBEXEC "/usr/libexec" > -#define PATH_GAMES "/usr/games" >=20 > /* Where to look for sources. */ > #define PATH_SOURCES \ >=20 > Modified: head/usr.bin/whereis/whereis.1 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/usr.bin/whereis/whereis.1 Thu Feb 12 04:31:17 2015 (r278615= ) > +++ head/usr.bin/whereis/whereis.1 Thu Feb 12 05:35:00 2015 (r278616= ) > @@ -65,8 +65,7 @@ The default path searched is the string=20 > utility for the > .Dq user.cs_path > string, with > -.Pa /usr/libexec , > -.Pa /usr/games > +.Pa /usr/libexec > and the current user's > .Ev $PATH > appended. >=20 > Modified: head/usr.bin/whereis/whereis.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/usr.bin/whereis/whereis.c Thu Feb 12 04:31:17 2015 (r278615= ) > +++ head/usr.bin/whereis/whereis.c Thu Feb 12 05:35:00 2015 (r278616= ) > @@ -265,7 +265,7 @@ defaults(void) > opt_b =3D opt_m =3D opt_s =3D 1; >=20 > /* -b defaults to default path + /usr/libexec + > - * /usr/games + user's path */ > + * user's path */ > if (!bindirs) { > if (sysctlbyname("user.cs_path", (void *)NULL, &s, > (void *)NULL, 0) =3D=3D -1) > @@ -276,11 +276,10 @@ defaults(void) > err(EX_OSERR, "sysctlbyname(\"user.cs_path\")"); > nele =3D 0; > decolonify(b, &bindirs, &nele); > - bindirs =3D realloc(bindirs, (nele + 3) * sizeof(char *)); > + bindirs =3D realloc(bindirs, (nele + 2) * sizeof(char *)); > if (bindirs =3D=3D NULL) > abort(); > bindirs[nele++] =3D PATH_LIBEXEC; > - bindirs[nele++] =3D PATH_GAMES; > bindirs[nele] =3D NULL; > if ((cp =3D getenv("PATH")) !=3D NULL) { > /* don't destroy the original environment... */ >=20 > Modified: head/usr.sbin/bsdconfig/include/messages.subr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/usr.sbin/bsdconfig/include/messages.subr Thu Feb 12 04:31:17 2= 015 (r278615) > +++ head/usr.sbin/bsdconfig/include/messages.subr Thu Feb 12 05:35:00 2= 015 (r278616) > @@ -138,7 +138,6 @@ msg_ftp=3D"FTP" > msg_ftp_desc=3D"FTP client and server utilities." > msg_ftp_passive=3D"FTP Passive" > msg_ftp_username=3D"FTP username" > -msg_games_desc=3D"Various games and sundry amusements." > msg_generating_index_from_pkg_database=3D"Generating INDEX from pkg(8) dat= abase\n(this can take a while)..." > msg_geography_desc=3D"Geography-related software." > msg_german_desc=3D"Ported software for Germanic countries." >=20 > Modified: head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh Thu Fe= b 12 04:31:17 2015 (r278615) > +++ head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh Thu Fe= b 12 05:35:00 2015 (r278616) > @@ -303,7 +303,7 @@ fetch_split_files() > OUTFILE=3D"${FSMNT}/.fetch-${INSFILE}" > fi >=20 > - DIRS=3D"base catpages dict doc games info manpages proflibs kernels src= " > + DIRS=3D"base catpages dict doc info manpages proflibs kernels src" > if [ "${FBSD_ARCH}" =3D "amd64" ] > then > DIRS=3D"${DIRS} lib32" >=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?B5EB7248-B156-4435-A716-80AE945FE6F5>