- remove the "real" dance. there is no longer a need for it.

- do not install the offensive files rotated 13 chars, as suggested by deraadt.
it hardly makes sense, and only one of the "potentially offensive" files
was being treated this way anyway

- simplify the makefile to catch up with all this

- update NOTES to catch up with all this

- the notes in README pertaining to not installing the offensive files is no
longer relevant, so remove it, as suggested by millert

4 files changed, 15 insertions, 30 deletions

diff --git a/games/fortune/Notes b/games/fortune/Notes
index 475af87e8ac..4247d1f1417 100644
--- a/games/fortune/Notes
+++ b/games/fortune/Notes
@@ -1,4 +1,4 @@
-#	$OpenBSD: Notes,v 1.5 2018/09/15 09:44:19 bentley Exp $
+#	$OpenBSD: Notes,v 1.6 2024/08/26 20:10:53 jmc Exp $
 #	$NetBSD: Notes,v 1.2 1995/03/23 08:28:26 cgd Exp $
 #	@(#)Notes	8.1 (Berkeley) 5/31/93
 
@@ -25,18 +25,18 @@ database, and "fort.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. "fortune" is the standard
+fortune database, and "fortune-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
 on the command line.
-	Potentially offensive fortune files should NEVER be maintained in
-clear text on the system.  They are rotated (see caesar(6)) 13 positions.
-To create a new, potentially offensive database, use caesar to rotate it,
-and then create its data file with the -x option to strfile(8).  The fortune
-program automatically decrypts the text when it prints entries from such
-databases.
+        Potentially offensive fortune files are maintained in
+clear text on the system.  If this is a concern, they can be rotated
+13 positions: to create a new, rotated database, use a utility such
+as rot13(6) or tr(1) to rotate it, and then create its data file
+with the -x option to strfile(8).  The fortune program automatically
+decrypts the text when it prints entries from such databases.
 	Anything which would not make it onto network prime time programming
 (or which would only be broadcast if some discredited kind of guy said it)
 MUST be in the potentially offensive database.  Fortunes containing any
diff --git a/games/fortune/README b/games/fortune/README
index 0fad125af47..2870ce28d92 100644
--- a/games/fortune/README
+++ b/games/fortune/README
@@ -1,12 +1,7 @@
-#	$OpenBSD: README,v 1.3 2002/04/02 02:06:25 pjanzen Exp $
+#	$OpenBSD: README,v 1.4 2024/08/26 20:10:53 jmc Exp $
 #	$NetBSD: README,v 1.2 1995/03/23 08:28:29 cgd Exp $
 #	@(#)README	8.1 (Berkeley) 5/31/93
 
-The potentially offensive fortunes ARE installed by default.  To avoid
-installing them, whack the Makefile in the subdirectory datfiles, and
-do "make all install".
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 	Some years ago, my neighbor Avery said to me: "There has not been an
 adequate jokebook published since "Joe_Miller", which came out in 1739 and
 which, incidentally, was the most miserable no-good ... jokebook in the
diff --git a/games/fortune/datfiles/Makefile b/games/fortune/datfiles/Makefile
index 6766c3ce784..e1701d00155 100644
--- a/games/fortune/datfiles/Makefile
+++ b/games/fortune/datfiles/Makefile
@@ -1,14 +1,10 @@
-#	$OpenBSD: Makefile,v 1.8 2024/08/23 03:25:32 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 2024/08/26 20:10:53 jmc Exp $
 #	$NetBSD: Makefile,v 1.15 1996/02/29 00:21:16 jtc Exp $
 #	@(#)Makefile	8.2 (Berkeley) 4/19/94
 
-SRCS=	fortunes fortunes2 startrek zippy recipes
-BLDS=	fortunes.dat fortunes2.dat startrek.dat zippy.dat \
-	fortunes-o fortunes-o.dat recipes.dat
-
-SRCS+=	fortunes2-o limerick
-BLDS+=	fortunes2-o.dat limerick.dat
-TYPE=	real
+SRCS=	fortunes fortunes-o fortunes2 fortunes2-o limerick recipes startrek zippy
+BLDS=	fortunes.dat fortunes-o.dat fortunes2.dat fortunes2-o.dat \
+	limerick.dat recipes.dat startrek.dat zippy.dat
 
 CLEANFILES+=${BLDS}
 
@@ -24,13 +20,7 @@ install: ${SRCS} ${BLDS}
 	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${BLDS} \
 	    ${DESTDIR}/usr/share/games/fortune
 
-fortunes.dat fortunes2.dat fortunes2-o.dat limerick.dat startrek.dat zippy.dat recipes.dat:
+fortunes.dat fortunes-o.dat fortunes2.dat fortunes2-o.dat limerick.dat recipes.dat startrek.dat zippy.dat:
 	${STRFILE} -s ${.CURDIR}/${.TARGET:R} ${.TARGET}
 
-fortunes-o.dat: fortunes-o
-	${STRFILE} -sx fortunes-o ${.TARGET}
-
-fortunes-o: fortunes-o.${TYPE}
-	tr [a-zA-Z] [n-za-mN-ZA-M] < ${.ALLSRC} > ${.TARGET}
-
 .include <bsd.prog.mk>
diff --git a/games/fortune/datfiles/fortunes-o.real b/games/fortune/datfiles/fortunes-o
index 5eb0e11bf31..5eb0e11bf31 100644
--- a/games/fortune/datfiles/fortunes-o.real
+++ b/games/fortune/datfiles/fortunes-o