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)

games/fortune/Notes

@@ -19,13 +19,13 @@ Warning:
 /usr/share/games/fortune.  A fortune file has two parts: the source file
 (which contains the fortunes themselves) and the data file which describes
 the fortunes.  The data file always has the same name as the fortune file
-with the string ".dat" concatenated, i.e. "fort" is the standard fortune
-database, and "fort.dat" is the data file which describes it.  See
+with the string ".dat" concatenated, i.e. "fortunes" is the standard fortune
+database, and "fortunes.dat" is the data file which describes it.  See
 strfile(8) for more information on creating the data files.
 	Fortunes are split into potentially offensive and not potentially
 offensive parts.  The offensive version of a file has the same name as the
-non-offensive version with "-o" concatenated, i.e. "fort" is the standard
-fortune database, and "fort-o" is the standard offensive database.  The
+non-offensive version with "-o" concatenated, i.e. "fortunes" is the standard
+fortune database, and "fortunes-o" is the standard offensive database.  The
 fortune program automatically assumes that any file with a name ending in
 "-o" is potentially offensive, and should therefore only be displayed if
 explicitly requested, either with the -o option or by specifying a file name
@@ -42,10 +42,10 @@ MUST be in the potentially offensive database.  Fortunes containing any
 explicit language (see George Carlin's recent updated list) MUST be in the
 potentially offensive database.  Political and religious opinions are often
 sequestered in the potentially offensive section as well.  Anything which
-assumes as a world view blatantly racist, mysogynist (sexist), or homophobic
+assumes as a world view blatantly racist, misogynist (sexist), or homophobic
 ideas should not be in either, since they are not really funny unless *you*
-are racist, mysogynist, or homophobic.
-	The point of this is that people have should have a reasonable
+are racist, misogynist, or homophobic.
+	The point of this is that people should have a reasonable
 expectation that, should they just run "fortune", they will not be offended.
 We know that some people take offense at anything, but normal people do have
 opinions, too, and have a right not to have their sensibilities offended by
@@ -53,7 +53,7 @@ a program which is supposed to be entertaining.  People who run "fortune
 -o" or "fortune -a" are saying, in effect, that they are willing to have
 their sensibilities tweaked.  However, they should not have their personal
 worth seriously (i.e., not in jest) assaulted.  Jokes which depend for their
-humor on racist, mysogynist, or homophobic stereotypes *do* seriously
+humor on racist, misogynist, or homophobic stereotypes *do* seriously
 assault individual personal worth, and in a general entertainment medium
 we should be able to get by without it.
 

games/fortune/datfiles/fortunes.sp.ok

@@ -205,7 +205,6 @@ Astaire's
 asterisked
 Asterix
 asthma's
-astonishment's
 Astro
 astrology
 Astroturf
@@ -217,7 +216,7 @@ Attila
 Auberon
 Auden
 AUDITME
-Audobon
+Audubon
 Auerbach
 Aug
 Augier
@@ -326,7 +325,6 @@ Beatty
 Beaumadine
 Beaumarchais
 Beauvoir
-becannt
 Becker's
 Beckett
 Beckmann
@@ -550,7 +548,6 @@ Bruton
 Brutus
 Bruyere
 Brylcreem
-Bryne's
 Brynner
 Bryson
 BST
@@ -1020,9 +1017,7 @@ deppart
 deregulated
 dermis
 DeSalvo
-DesCartes
 Desiree
-dessicated
 deStalinization
 destitution
 destructure
@@ -1159,7 +1154,6 @@ Dutsky
 dwelleth
 Dyer's
 Dykes
-Dykstra
 dyslexic
 Dyson
 Eagleson
@@ -1240,16 +1234,13 @@ endian
 Enesco
 Enfolding
 England's
-Englebert
 Englishman's
 ENIACs
 enkindles
 Enm
 Ennius
 Ennui
-enobled
 ENOTADUCK
-ensconsed
 Epcot
 Ephron
 EPI
@@ -1547,7 +1538,6 @@ Garbers
 Gardner's
 garnishment
 Garp
-Gastly
 Gatling
 Gaulle
 Gauls
@@ -1580,7 +1570,6 @@ getchar
 Getraenke
 Gettys
 gewerken
-Ghandi
 gharsley
 Ghostbusters
 Giancana
@@ -1643,7 +1632,6 @@ Goebbels
 goest
 Goestheveezl
 goeth
-Goethe's
 Gold's
 Golda
 Goldengrove
@@ -1656,7 +1644,6 @@ Goldwyn
 Goleta
 Gomme's
 Gondoliers
-Gondwondaland
 gonna
 Gonnet
 goodbye
@@ -1670,7 +1657,6 @@ Gordon's
 Gorey
 Gorin
 Gossling
-Gotama
 Gotlieb
 goto
 goto's
@@ -2088,7 +2074,6 @@ IRS
 Irulan
 Isaak
 Iso
-Issac
 Issawi
 Issawi's
 Ist
@@ -2150,7 +2135,6 @@ joggers
 Jogging
 Johnson's
 Johnston
-Jonathon
 Jone's
 Jones's
 Jonesboro
@@ -2374,7 +2358,6 @@ Lapwarmer
 Lardner
 Larkin
 Larkinson's
-LaRouchefoucauld
 Lascl
 laserbeam
 Lasorda
@@ -2414,8 +2397,7 @@ Lehrer
 Leia
 Leibe
 Leiber
-Leibnitz
-Leibowitz
+Leibniz
 Leibowitz's
 Leith
 Lem
@@ -2428,7 +2410,6 @@ lerts
 les
 LeSage
 letez
-Letterman's
 Lettvin
 Levant
 Levenson
@@ -2827,7 +2808,6 @@ Moping
 moralists
 Mordecai
 Mordor
-Morganstern
 Morley
 morons
 Morrisey
@@ -2907,7 +2887,6 @@ nanocentury
 nanohenry
 nanometers
 Nansen
-Napolean
 Napoleon's
 narcolepulacyi
 Narnia
@@ -2930,7 +2909,6 @@ Neantical
 Nebuchadnezzar
 Nebuchadnezzar's
 necesas
-necessitas
 necessitious
 NecroSoft
 Nehru
@@ -2984,7 +2962,6 @@ Niven
 Nixon's
 Noah's
 noalias
-Nobert
 Noelie
 nog
 nogiftlist
@@ -3053,7 +3030,6 @@ OCP
 Oct
 octalthorpe
 Octopussy
-Odgen
 Oech
 Oedipa
 Ogborn
@@ -3172,7 +3148,7 @@ Parnas
 Parnell
 paroxysmally
 Parrafin
-parthenon
+Parthenon
 passwd
 pastureland
 Patageometry
@@ -3340,7 +3316,6 @@ PRL
 PROCESSORs
 Prochnow
 proelium
-proferred
 profundities
 proletarian
 Propos
@@ -3455,7 +3430,6 @@ Reichel's
 Reinfeld
 Reinhart
 Reisner's
-reknowned
 Relaxen
 RENE
 Renegades
@@ -3531,7 +3505,6 @@ Rosten
 Rotherham
 Rothesay
 Rothschild
-Rouchefoucauld
 Roumania
 rousers
 Rowlands
@@ -3653,7 +3626,7 @@ Schweitzer
 Schwiggle
 Schwine
 Scientologist
-scintilate
+scintillate
 Scintillae
 Scott's
 Scoville
@@ -3883,7 +3856,6 @@ Steinbach
 Steinbach's
 Steinbeck
 Steinem
-Steinham
 Steinman
 Stekel
 Stenderup's
@@ -3926,7 +3898,7 @@ Sugarcreek
 Suggoth
 Sulu
 Sumeria
-Summatra
+Sumatra
 sunbathing
 SunCheckup
 SUNKIST
@@ -3987,7 +3959,6 @@ Talking's
 Tallulah
 tamperest
 Tanenbaum
-Tannenbaum
 tannogallate
 tapeworms
 tapioca
@@ -4150,7 +4121,6 @@ TYDFS
 tyg
 typefaces
 Tyroon
-tyrranize
 tzu
 Ubi
 UDA
@@ -4168,7 +4138,6 @@ unamerican
 unbegot
 unbelievers
 UNC
-Uncatylised
 undemanding
 underachiever
 Unger
@@ -4273,7 +4242,7 @@ vodkas
 Vogon
 Vogons
 voist
-Volkswagon
+Volkswagen
 Vollyballocracy
 Voltarine
 von
@@ -4373,7 +4342,6 @@ whomped
 Whooa
 Whoopie
 Wickersham
-wierdest
 Wiggam
 Wihelminalaan
 Wiker's
@@ -4391,7 +4359,6 @@ Winchell
 Windex
 windstorms
 Winfrey
-Winie
 winnowed
 Winny
 Winokur
@@ -4423,7 +4390,6 @@ woodlands
 Woodstock
 Woodward's
 Wookiee
-Woolcott
 Woolf
 Woollcott
 worketh
@@ -4446,7 +4412,6 @@ Xaviera
 XCVI
 xen
 xenophobic
-Xercies
 XGP
 XIIdigitation
 XINU

games/fortune/datfiles/limerick

@@ -827,8 +827,8 @@ And such is the Kingdom of Heaven.
 %
 A pretty young lady named Vogel
 Once sat herself down on a molehill.
-     A curious mole
-     Nosed into her hole --
+	A curious mole
+	Nosed into her hole --
 Ms. Vogel's okay, but the mole's ill.
 %
 A pretty young maiden from France
@@ -854,7 +854,7 @@ Said, I'm the match for any machine.
 	My secret's aversion,
 	To loops and recursion,
 Just acres of in-line routine.
-		-- W.J. Wilson
+		-- W. J. Wilson
 %
 A progressive professor named Winners
 Held classes each evening for sinners.
@@ -1097,7 +1097,7 @@ Reproached for not acting quite primly
 	I know sex isn't love,
 But it's such an entrancing facsimile."
 %
-A water pipe suited miss Hunt;
+A water pipe suited Miss Hunt;
 She used it for many a bunt.
 	But the unlucky wench
 	Got it caught in her trench ---
@@ -2048,9 +2048,9 @@ Who canoed with a girl in Bermuder.
 So McGru took an oar and subduder.
 %
 There once was a man named McSweeny
-Who spilled lots of gin on his weeney
-	So just to be couth
-	He added vermouth
+Who spilled lots of gin on his weeney.
+	So just to be couth,
+	He added vermouth,
 And slipped his best girl a martini.
 %
 There once was a man named Parridge
@@ -2259,7 +2259,7 @@ There was a gay countess of Bray,
 And you may think it odd when I say,
 	That in spite of high station,
 	Rank and education,
-She always spelled cunt with a 'k'.
+She always spelled cunt with a "k."
 %
 There was a gay dog from Ontario
 Who fancied himself a Lothario.
@@ -2564,7 +2564,7 @@ There was a young fellow named Paul
 Who confessed, "I have only one ball.
 	But the size of my prick
 	Is God's dirtiest trick,
-For my girls always ask, 'Is that all?'"
+For my girls always ask, `Is that all?'"
 %
 There was a young fellow named Pell
 Who didn't like cunt very well.
@@ -3043,7 +3043,7 @@ Who strung himself up with a cord
 	Said he, of his work
 	(Ere the rope snapped with a jerk)
 "I am leaving because I am bored."
-		- E.A. Guest
+		-- E. A. Guest
 %
 There was a young lad named McFee
 Who was stung in the balls by a bee
@@ -4423,7 +4423,7 @@ Who was stung in the arm by a wasp.
 	When asked, "Does it hurt?"
 	He replied, "No, it doesn't.
 I'm so glad that it wasn't a hornet."
-		-- W.S. Gilbert
+		-- W. S. Gilbert
 %
 There was an old man of Tagore
 Whose tool was a yard long or more,

games/fortune/datfiles/startrek

@@ -507,6 +507,7 @@ The joys of love made her human and the agonies of love destroyed her.
 %
 The man on tops walks a lonely street; the "chain" of command is often
 a noose.
+		-- McCoy, "The Conscience of the King," stardate 2818.9
 %
 The more complex the mind, the greater the need for the simplicity of
 play.
@@ -656,7 +657,7 @@ What kind of love is that?  Not to be loved; never to have shown love.
 		-- Commissioner Nancy Hedford, "Metamorphosis",
 		   stardate 3219.8
 %
-When a child is taught ... its programmed with simple instructions --
+When a child is taught ... it's programmed with simple instructions --
 and at some point, if its mind develops properly, it exceeds the sum of
 what it was taught, thinks independently.
 		-- Dr. Richard Daystrom, "The Ultimate Computer",
@@ -689,7 +690,7 @@ sheer horror than the male of the species.
 		-- Spock, "Wolf in the Fold", stardate 3615.4
 %
 Women professionals do tend to over-compensate.
-		-- Dr. Elizabeth Dehaver, "Where No Man Has Gone Before",
+		-- Dr. Elizabeth Dehner, "Where No Man Has Gone Before",
 		   stardate 1312.9.
 %
 Worlds are conquered, galaxies destroyed -- but a woman is always a

games/fortune/datfiles/zippy

@@ -178,7 +178,7 @@ LEFT at th'HOLIDAY INN!!  JOIN the CREDIT WORLD!!  MAKE me an OFFER!!!
 CONGRATULATIONS!  Now should I make thinly veiled comments about
 DIGNITY, self-esteem and finding TRUE FUN in your RIGHT VENTRICLE??
 %
-Content:  80% POLYESTER, 20% DACRONi ... The waitress's UNIFORM sheds
+Content:  80% POLYESTER, 20% DACRON ... The waitress's UNIFORM sheds
 TARTAR SAUCE like an 8" by 10" GLOSSY ...
 %
 Could I have a drug overdose?
@@ -200,7 +200,7 @@ DIDI ... is that a MARTIAN name, or, are we in ISRAEL?
 %
 Didn't I buy a 1951 Packard from you last March in Cairo?
 %
-Disco oil bussing will create a throbbing naugahide pipeline running
+Disco oil bussing will create a throbbing naugahyde pipeline running
 straight to the tropics from the rug producing regions and devalue the
 dollar!
 %
@@ -290,7 +290,7 @@ He is the MELBA-BEING ... the ANGEL CAKE ... XEROX him ... XEROX him --
 %
 He probably just wants to take over my CELLS and then EXPLODE inside me
 like a BARREL of runny CHOPPED LIVER!  Or maybe he'd like to
-PSYCHOLIGICALLY TERRORISE ME until I have no objection to a RIGHT-WING
+PSYCHOLOGICALLY TERRORISE ME until I have no objection to a RIGHT-WING
 MILITARY TAKEOVER of my apartment!!  I guess I should call AL PACINO!
 %
 Hello?  Enema Bondage?  I'm calling because I want to be happy, I
@@ -351,7 +351,7 @@ MOUSTACHE ...  Have you ever noticed th' way it radiates SINCERITY,
 HONESTY & WARMTH?  It's a MOUSTACHE you want to take HOME and introduce
 to NANCY SINATRA!
 %
-How many returned bricklayers from FLORIDA are out purchasing PENCIL
+How many retired bricklayers from FLORIDA are out purchasing PENCIL
 SHARPENERS right NOW??
 %
 How's it going in those MODULAR LOVE UNITS??
@@ -604,7 +604,7 @@ if it GLISTENS, gobble it!!
 %
 If our behavior is strict, we do not need fun!
 %
-If Robert Di Niro assassinates Walter Slezak, will Jodie Foster marry
+If Robert De Niro assassinates Walter Slezak, will Jodie Foster marry
 Bonzo??
 %
 I'll eat ANYTHING that's BRIGHT BLUE!!
@@ -802,7 +802,7 @@ ASHTRAYS ...
 %
 Let me do my TRIBUTE to FISHNET STOCKINGS ...
 %
-Let's all show human CONCERN for REVERAND MOON's legal difficulties!!
+Let's all show human CONCERN for REVEREND MOON's legal difficulties!!
 %
 Let's send the Russians defective lifestyle accessories!
 %