git: fortune(6): Merge fortunes2 into regular fortunes

[Sascha Wildner <swildner@xxxxxxxxxxxxxxxxxxxxxxx>]

commit 9401d887c6e235993e605c286992a3c41abc882c
Author: Ulrich Spörlein <uqs@spoerlein.net>
Date:   Wed Jan 20 11:05:47 2010 +0100

    fortune(6): Merge fortunes2 into regular fortunes
    
    - Stop special ROT13 treatment of fortunes-o. Neither murphy-o,
      fortunes2-o nor limerick were doing the same and contain even
      more possibly offensive stuff.
    - Merge the spelling files for fortunes{,-o}, this improves
      maintainability in case fortunes are moved between the files
    - make the installation of offensive stuff depend on
      INSTALL_OFFENSIVE_FORTUNES, like NetBSD (defaults to yes).
      Previously you had to edit the Makefile to disable this.
    - Drop CVS Ids, which are no longer maintained :(
    
    No fortunes added or removed from the pool.

Summary of changes:
 games/fortune/datfiles/Makefile                    |   28 +-
 games/fortune/datfiles/fortunes                    |46077 +++++++++++++++++++-
 games/fortune/datfiles/{fortunes2-o => fortunes-o} | 2260 +-
 games/fortune/datfiles/fortunes-o.fake             |    2 -
 games/fortune/datfiles/fortunes-o.real             | 2246 -
 games/fortune/datfiles/fortunes-o.sp.ok            |  299 -
 games/fortune/datfiles/fortunes.sp.ok              |  256 +-
 games/fortune/datfiles/fortunes2                   |46084 --------------------
 8 files changed, 48590 insertions(+), 48662 deletions(-)
 rename games/fortune/datfiles/{fortunes2-o => fortunes-o} (87%)
 delete mode 100644 games/fortune/datfiles/fortunes-o.fake
 delete mode 100644 games/fortune/datfiles/fortunes-o.real
 delete mode 100644 games/fortune/datfiles/fortunes-o.sp.ok
 delete mode 100644 games/fortune/datfiles/fortunes2

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/9401d887c6e235993e605c286992a3c41abc882c


-- 
DragonFly BSD source repository