Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Remove fortunes-o from the base system. Debating what does or does not
belong in this file is not a useful exercise or conducive to producing a
high quality advanced operating system.

While here, simplify the make rules to autocompute BLDS and FILES from a
single DB variable.

Approved by: core
MFC after: 1 week

Combine the fortunes-o.real and the fortunes2-o file, as was done
with fortunes and fortunes2 2 years and 2 days ago. The fortunes2-o
file was brought in with the original import of the 4.4 Lite games
directory, but has always consisted in large part of fortunes
duplicated from other files.

The combined size of the two files is still only 631K, or less
than 1/3rd of the size of the fortunes file.

Combining them has the added benefit of making the fortunes from
fortunes2-o visibile to fortune(6)'s -m option.

This change should probably not be MFC'ed beyond RELENG_7.

More stale maintainer.

Merged fortunes with fortunes2.
Sort fortunes (except for the first entry).

LANG->LC_ALL

Pointed by: ru

Use LANG=C before tr to be shure that ranges are correct

In the build process, fortune files have been randomized since at
least the 4.4-lite days. This is pointless, since fortune(6) performs
its own randomization. It was also problematic for binary update
systems such as ports/security/freebsd-update. This commit simply
removes the -r option to strfile so that the datfiles are constant.

Submitted by: Colin Percival <cperciva@sfu.ca>

Add gerrold.limerick to the building process.

FILES support for bsd.prog.mk. See bsd.README for details.

Stolen from: NetBSD

Add a new category of fortunes, 'freebsd-tips'. Useful hints, advice, and
pointers to areas of the system that might not be apparent on first
inspection.

Games ownership cleanup.

Urged by: bde

Quoting submitter:

This is a recent conversion of an old IBM Mainframe application
to the fortune datafile format.

The "laws" were extracted from a S/370 Assembler program on a SHARE tape.
The comments in the program:

*---------------------------------------------------------------------*
* 'MURPHY' THE OLE PHILOSOPHER 18 AUGUST 1988 *
* *
* MURPHY WAS FOUND ON A JES2 TAPE OF ALL PLACES WITH ABOUT *
* 500 OR SO SAYINGS. GOT ANOTHER 250 FROM AN UNKNOWN SOURCE *
* AND HAVE ADDED ABOUT 100 OR SO MYSELF. *
* *
[list of changes omitted]
* *
* JIM MARSHALL, CAPT, USAF *
* (301) 688-6829 *
* *
*---------------------------------------------------------------------*

Fortunes that a sufficiently twisted mind could perceive as offensive
have been moved to murphy-o. Thanks to the submitter for reviewing
these fortunes.

The copyright issues were considered before approval.

PR: misc/8519
Submitted by: Cy Schubert (misc/8519)
Approved by: The Fortune Teller

Use tr(1) instead of caesar(6) to perform the rotation. This removes
the dependency on caesar which therefore doesn't need to be built by
bootstrap-tools.

Suggested by: des
Previously mentioned by: Peter Jeremy <peter.jeremy@alcatel.com.au>

*blush* Instead of undoing my own change, i clobbered dcs's rev 1.21
change.

I'll never touch this again...

Back out rev 1.21. bde and dcs convinced me that all this is messed up
anyway, and there can't be any solution that will universally work in any
case (make world, cross-compilation, simple `make' without `make world'
after incompatible options have been added to strfile, ...)

Revert to 1.19. ${.OBJDIR}/../strfile must be taken out, since it
breaks the cross-compilation case, but I'm not the one doing it.
$$PATH *will* have a new strfile in /usr/bin built at build-tools
time, unless you defined NOTOOLS.

If you defined NOTOOLS and it breaks for you, don't do that.

If you did not define NOTOOLS but things are not working, the error is
elsewhere. See logs for src/Makefine.inc1, particularly rev 1.36, and
revision 1.14 of this file.

Reverse the way $PATH is extended, so if the person building that area
has /usr/games in its $PATH, where /usr/games/strfile doesn't grok an
option that the newly built one inside /usr/obj would grok, the build
process would be able to complete.

Notice the -C flag got dropped when I reverted to version 1.15, and put it
back.

I'll take the MAINTAINER line. I have been accused of knowing humor
when I at least see it. :)

Revert to 1.15, since, as pointed out by bde, 1.16 is wrong and evil.
Add $FreeBSD$.

Change path order in makefile so newer fortune files will be built with
the latest fortune (strfile/caesar) sources.

Correct a separator type in fortunes2.

Add Unix geeks dating instructions (reference card style).

Allow building games w/o an existing /usr/games.

Fixed building without /usr/games in $PATH. Just add /usr/games
to the _end_ of $PATH before using tools that are normally in
/usr/games. I broke this in rev.1.9 by assuming that these tools
are in $PATH (as they are for `make world' unless NOTOOLS is set).
Revs.1.10-1.13 of this file had various wrong fixes. Rev.1.18
of src/Makefile.inc1 has an incomplete fix.

PR: 7936

Fixed comments about what to comment out to [not] install the
potentially offensive fortunes. This should be configured using
an ifdef.

Fixed missing dependencies of fortunes.dat on fortunes, etc.

Removed bogus dependency of `all' on source files.

Fixed some style bugs.

Back out the last two hacks. I've added games to the (correct) build
path in src/Makefile.inc. The code that I'm backing out didn't work
anyway since exists() checks for a file in .PATH (and /usr/games/strfile
doesn't exist there), so the test was always defaulting to ../strfile/strfile
which breaks cross-compiled builds.

Remove bogus dependencies.

Submitted by: bde

Reverse the sense of the test looking for caesar & strfile.

Don't expect /usr/games in the path.
Avoid using /usr/games versions if we can find what we need (caesar & strfile)
in the buildtree.

PR: 7936
Submitted by: Achim Patzner <ap@noses.com>

Use the installed versions of caesar and strfile. They are now
bootstrapped by `make world', and the installed versions are just
as likely to work as the installed version of cc if `make' is run
directly.

444 -> ${NOBINMODE}
/usr/share -> ${SHAREDIR}
/usr/games -> ${BINDIR}

Fixed annoying non-null output for `make depend'. SRCS should only
be used for C, C++ and assembler sources if <bsd.prog.mk> is
included. It was used for general files. This caused the __depend_*
lists in <bsd.dep.mk> to be empty, so mkdep was never run, so
.depend never existed, so it was always out of date, so `rm -f
.depend' was always executed to update it.

Bring in my changes for removing the pestilent obj links (unless you
really want them) from /usr/src. This is the final version of the
patches, incorporating the feedback I've received from -current.

Localize it.
off_t -> long.
Install strfile & unstr
-Wall cleanup
Fix matching bug with offensive database

Find caesar and strfile properly.
Generate .dat files on build state

Change `install' to `${INSTALL}' as usual.

Install the `built' files with flag ${COPY}.

If possible, pick up the caesar program inside in the compilation tree.

This commit was generated by cvs2svn to compensate for changes in r2490,
which included commits to RCS files with non-trunk default branches.

Bring in the 4.4 Lite games directory, modulo man page changes and segregation
of the x11 based games. I'm not going to tag the originals with bsd_44_lite
and do this in two stages since it's just not worth it for this collection,
and I've got directory renames to deal with that way. Bleah.
Submitted by: jkh