Commit Graph

606 Commits

Author SHA1 Message Date
gavin
389d6e5a74 Merge r268637 from head:
fortune(8): Search fortune files installed by ports/packages as well as
  those supplied by the base system.

PR:		191800
Submitted by:	Andy Kosela
2014-08-13 12:36:59 +00:00
gavin
dcf48e8568 Merge r268295 from head:
Fix equation and limerick to be correct.  NetBSD fixed this 14 years ago
  (src/games/fortune/datfiles/fortunes2 1.7).

PR:		188714
Submitted by:	ksmakoto dd.iij4u.or.jp
2014-07-16 12:41:50 +00:00
marcel
a0e0e5fec0 MFC r259057:
Remove "Warning: file \"%s\" unreadable". It was introduced with revision
44599 and turned less than useful ever since fortunes-o.dat got removed.
2014-02-16 20:13:18 +00:00
marcel
ad410a47a2 MFC r259056:
Fix r203922 for "fortune -o".
2014-02-16 20:02:29 +00:00
glebius
ade139e19b Refresh the tips for the new pkg system.
Reviewed by:	bapt
Approved by:	re (hrs)
2013-10-03 11:51:15 +00:00
eadler
a43818500f Remove a reference to instant-server which has been removed from the
ports tree in r313427.

PR:		177012
Submitted by:	Kevin Zheng <kevinz5000@gmail.com>
Approved by:	bcr (mentor)
2013-03-21 12:42:25 +00:00
jhb
369cfc7386 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
2013-03-12 12:35:02 +00:00
des
72c8e2de52 Remove political propaganda 2013-02-05 14:39:37 +00:00
eadler
13826589d2 Use Bernard Baruch's full name.
The words "old than" seem to be quoted as "older than" by some sources,
so use the more likely and grammatically correct text.

PR:		docs/173868
Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>
Approved by:	cperciva
MFC after:	1 week
2012-12-05 13:57:00 +00:00
jmg
fe8941c823 fix a couple of spelling errors... 2012-11-15 03:22:50 +00:00
dim
28618b83a7 In games/fortune/fortune/fortune.c, make 'Debug' the correct type (it is
*not* a boolean).

MFC after:	3 days
2012-11-14 18:52:37 +00:00
eadler
63f3f6b3d4 Make OK_TO_WRITE_TO_DISK an envrionment variable instead
of a compile time option.

While here, don't differ based on the existence of LOCK_EX
which doesn't seem to have ever made a difference on FreeBSD.

Approved by:	cperciva (from discussion)
MFC after:	3 days
2012-11-04 15:15:47 +00:00
eadler
0b0da0bc2a Prefer the use of stdbool to custom defines.
Approved by:	cperciva (from discussion)
MFC after:	3 days
2012-11-04 15:15:43 +00:00
eadler
f368f40efc Remove extra word:
Submitted by:	many
Approved by:	cperciva (implicit)
MFC after:	3 days
2012-10-23 15:03:25 +00:00
eadler
4110ecce3a Sysinstall has been removed from base.
Approved by:	cperciva
2012-10-22 03:00:43 +00:00
eadler
4519224f47 Make do_uniq work with python3
Approved by:	cperciva
MFC after:	3 days
2012-10-22 02:29:56 +00:00
eadler
ebcbf50685 Correct the tip about finding all the directories on the system
Add a tip about clearing the screen.
Make things more consistent by removing quotes around 'make search'

Approved by:	cperciva
MFC after:	3 days
2012-10-02 00:30:15 +00:00
dougb
28600196ba Add a couple of nice quotes from Edward Everett Hale 2012-07-29 01:01:35 +00:00
eadler
64ab4ef2f5 Partial revert of previous commit as some of the changes were not
newbie-friendly.

Requested by:	jhb, gcooper
Approved by:	cperciva (implicit)
MFC after:	3 days
X-MFC-With:	r235209
2012-05-10 12:46:12 +00:00
eadler
1d7eb4dfbb Add a few new tips and update some old ones to more modern commands
MFC after:	1 week
2012-05-09 22:13:56 +00:00
ed
e7e5b53bf1 Replace index() and rindex() calls with strchr() and strrchr().
The index() and rindex() functions were marked LEGACY in the 2001
revision of POSIX and were subsequently removed from the 2008 revision.
The strchr() and strrchr() functions are part of the C standard.

This makes the source code a lot more consistent, as most of these C
files also call into other str*() routines. In fact, about a dozen
already perform strchr() calls.
2012-01-03 18:51:58 +00:00
dougb
96d2ec96a9 1. Correct capitalization of the nobility particle for
Francois de La Rochefoucauld introduced in r228909 [1],[2]

2. Change c-cedilla introduced in the same commit to ASCII c since
   non-UTF-8 terminals will choke on the non-ASCII text. [2],[3]

Pointed out by:	bf [1]
Reviewed by:	French-speakers on #bsdcode [2]
Requested by:	uqs [3]
2011-12-28 22:18:53 +00:00
uqs
68c3cd3b7e Prefer ASCII apostrophes over Unicode ones like the rest of the file. 2011-12-28 19:37:03 +00:00
dougb
f982f04def 1. Remove a bunch of duplicates. Usually this means removing them from
fortunes, but occasionally remove them from the other 2 files when
   they are not offensive, or not murphy'ish enough.

   Where the version in fortunes had better attribution and/or formatting,
   copy it over.

2. Fix a few typos

3. Use the full name of François De La Rochefoucauld, fix one of his
   quotes, and remove the duplicate of it.
2011-12-27 10:21:57 +00:00
ed
af1e42f366 Add static keywords to variables and functions where possible in games/.
This allows us to detect unused functions and variables and allows the
compiler to do a better job at optimisation.
2011-11-05 07:18:53 +00:00
dougb
903461fc0b Fix the text and attribution of the poem "Youth" by Samuel Ullman.
Our copy was a bastardization of the "older" (probably original?) and
shorter version of the poem; and the "newer" version that is better
known, and arguably more popular. Standardize on the latter.

Cf. http://www.bartleby.com/73/2099.html
2011-10-29 06:33:12 +00:00
dougb
19ee445add Minor typo, fix 2 attributions 2011-06-09 06:10:39 +00:00
uqs
387ef87903 Convert a file to UTF-8. This only changes a character in the
copyright section and will not require UTF-8 for fortune(6).
2011-05-14 19:03:54 +00:00
uqs
a60c79bc44 fortune(6): fix typos and misspellings.
While here, drop words in the spelling files that are no longer used
anywhere.

Speling errors found via:	codespell from Lucas De Marchi
2011-05-14 19:03:45 +00:00
brucec
15edba98d5 Move potentially offensive fortune to fortunes-o.
PR:	bin/137702
MFC after:	3 days
2011-02-13 18:18:56 +00:00
cperciva
5cb9bcbf09 Add advice to new fathers from Thomas Ptacek.
Suggested by:	wilko
Approved by:	Thomas Ptacek
Security:	New parents often feel very insecure.
2010-09-29 23:47:06 +00:00
jmg
dea7e7503e fix the move so that it matches what the rest of the internet
says about this game...  This move also makes more sense...

MFC after:	1 week
2010-09-03 03:20:34 +00:00
fjoe
855b4d34ca "whereis netscape" gives empty output for quite a long time already.
Suggest to use "whereis firefox" instead.
2010-08-09 09:26:17 +00:00
uqs
d5b10f78d9 Fix indention of attribution line for some recent additions.
MFC after:	3 days
2010-07-30 20:20:14 +00:00
dougb
0e1b75189b Correct a Cecil Beaton quote
PR:		docs/148916
Submitted by:	Rob Farmer <rfarmer@predatorlabs.net>
2010-07-25 21:35:56 +00:00
dougb
96f7f6794f Taken from actual police videos ... 2010-06-26 07:02:31 +00:00
uqs
b9a504725e Sync fortunes with other *BSDs
- Spelling errors
- Typographical fixes
- Consistent attributions
- Use Jr. more consistently
- Capitalization of dictionary-like entries
- Sorting using tools/do_sort
- Remove duplicate fortunes
- Style according to the Notes file
- Reflect correct default fortune name in Notes
- Remove some no longer needed spelling hints
- Drop latin1 characters (sorry Mårten)

This is a partial sync against the DragonflyBSD sources, where a lot of
fixes from Free, Net and OpenBSD were merged previously. Only about 50%
of the changes originate from there, the rest was done by dougb and
yours truly.

Partial review by:	wilko (earlier version), ed (dito)
In collaboration with:	dougb
Approved by:		ed (co-mentor)
2010-03-31 18:21:25 +00:00
wilko
2c2b4cb0e3 s/all ready/already/
Submitted by:	ru@, gj@
2010-02-26 16:27:11 +00:00
wilko
709c06294d On the (non)sense of legal disclaimers in emails. 2010-02-25 15:03:57 +00:00
uqs
74cf8088e7 Prefer exit(0) from main over return(0).
Although not explicitly mentioned in style(9), it allows for easier
grepping of exit points. This reverts part of r203926.

Requested by:	des
Approved by:	philip (mentor)
2010-02-21 21:03:15 +00:00
uqs
6dbf26d197 fortune(6) switch to 3-clause BSDL; style(9)
This reduces the diff to other *BSD and makes it possible to actually
see the code differences.

Approved by:	ed (Co-mentor)
2010-02-15 15:10:21 +00:00
uqs
23cb4f332d games: make WARNS=6 the default, remove overrides
This also bumps factor, fortune, primes, and random to WARNS=6.

Approved by:	ed (Co-mentor)
2010-02-15 14:32:00 +00:00
uqs
9dc5fb429a fortune(6) make WARNS=6 clean
Fixes taken mostly from DragonflyBSD.

Approved by:	ed (Co-mentor)
2010-02-15 14:31:30 +00:00
gnn
a98b1b2040 Add the definition of Mistakeholder 2010-02-09 14:51:39 +00:00
gavin
191eb488de Our standard "xterm" termcap entry supports colour, so this tip is redundant.
As it happens, "xterm-color" has just been an alias for "xterm" since
src/share/termcap/termcap.src 1.131 in September 2002.

PR:		docs/132959
Approved by:	ed (mentor)
2010-01-11 21:17:49 +00:00
dougb
2be9e943a9 For the now-infamous Rumsfeld quote:
Change "there're" to "there are" which is consistent with the vast
majority of on line references.

Remove a spurious trailing "

Update the citation text with a suggestion from des.
2010-01-07 23:30:10 +00:00
stas
a3ff55adf7 - Move potentially offensive quotes I committed recently to fortunes-o.
- Reference date.
- Be more clear on context.

Suggested by:	dougb
2010-01-05 23:35:43 +00:00
dougb
633e4d704e Remove more duplicates
Minor reformatting on a few
2010-01-05 19:40:32 +00:00
stas
05cd6c9186 - Add two particulary interesting quotes from the past decade. 2010-01-04 09:16:35 +00:00
ed
b90af5ae21 Use ANSI C function declarations. 2009-12-29 08:42:58 +00:00