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.

ObsoleteFiles.inc

@@ -14,6 +14,9 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20071207: Merged with fortunes-o.real
+OLD_FILES+=usr/share/games/fortune/fortunes2-o
+OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat
 # 20071129: Disabled static versions of libkse by default
 .if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no"
 OLD_FILES+=usr/lib/libkse.a

games/fortune/datfiles/Makefile

@@ -9,8 +9,8 @@ BLDS=	fortunes.dat murphy.dat startrek.dat zippy.dat \
 # THREE LINES AND UNCOMMENT THE FOURTH LINE.
 
 # THE THREE LINES:
-FILES+=	fortunes2-o limerick murphy-o gerrold.limerick
-BLDS+=	fortunes2-o.dat limerick.dat murphy-o.dat gerrold.limerick.dat
+FILES+=	limerick murphy-o gerrold.limerick
+BLDS+=	limerick.dat murphy-o.dat gerrold.limerick.dat
 TYPE=	real
 
 # THE FOURTH LINE:
@@ -21,7 +21,7 @@ CLEANFILES+=${BLDS}
 
 FILESDIR=	${SHAREDIR}/games/fortune
 
-.for f in fortunes fortunes2-o freebsd-tips gerrold.limerick limerick murphy murphy-o startrek zippy
+.for f in fortunes freebsd-tips gerrold.limerick limerick murphy murphy-o startrek zippy
 $f.dat: $f
 	PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \
 	    strfile -Cs ${.ALLSRC} ${.TARGET}