git: fortune(6): Sync improvements with Free/Net/OpenBSD; deduplicate

[Sascha Wildner <swildner@xxxxxxxxxxxxxxxxxxxxxxx>]

commit ea4682d893d34ca8b6b53f393331791c2c0ad6a8
Author: Ulrich Spörlein <uqs@spoerlein.net>
Date:   Sat Jan 9 16:23:32 2010 +0100

    fortune(6): Sync improvements with Free/Net/OpenBSD; deduplicate
    
    - Typos, attributions and style improvements.
    - Make attributions and style more consistent and conforming to Notes
    
    Some of these are taken from FreeBSD, some from NetBSD and a few from
    OpenBSD. Yet quite a few more are by yours truly.
    
    Also:
    
    - Fix typos in fortunes.sp.ok, murphy
    - Remove duplicated fortunes (some where present thrice!)
      - fortunes is king and loses no cookie
      - fortunes-o contains no cookies already in fortunes
      - fortunes2-o contains no cookies already in fortunes2, fortunes or
        fortunes-o
      - fortunes2 contains no cookies already in fortunes
      - finally, cookies in fortunes2 were removed, if they were already in
        fortune-o
    
    The reasoning for the last step is, that when fortunes2 gets merged into
    fortunes, no possible offensive quotes show up there, that were already
    deemed offensive and moved from fortunes to fortunes-o
    
    - Remove some quotes from murphy-o already in other files, sort
    - Remove duplicates within limerick (via OpenBSD)
    - Sync startrek to NetBSD/OpenBSD; sort
    - Typos in zippy

Summary of changes:
 games/fortune/datfiles/fortunes        | 1487 ++--
 games/fortune/datfiles/fortunes-o.real |   52 +-
 games/fortune/datfiles/fortunes.sp.ok  |    8 +-
 games/fortune/datfiles/fortunes2       |11915 +++-----------------------------
 games/fortune/datfiles/fortunes2-o     | 1861 +-----
 games/fortune/datfiles/limerick        |  272 +-
 games/fortune/datfiles/murphy          |   16 +-
 games/fortune/datfiles/murphy-o        |   19 +-
 games/fortune/datfiles/startrek        |   73 +-
 games/fortune/datfiles/zippy           |   14 +-
 games/fortune/datfiles/zippy.sp.ok     |    2 +-
 11 files changed, 1899 insertions(+), 13820 deletions(-)

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/ea4682d893d34ca8b6b53f393331791c2c0ad6a8


-- 
DragonFly BSD source repository